November 2009 - Lima-commits - mailman.cloud.codelutin.com

r2744 - in trunk/lima-main/src/main: java/org/chorem/lima java/org/chorem/lima/export java/org/chorem/lima/ui resources/i18n
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 16:26:23 +0100 (Sun, 08 Nov 2009) New Revision: 2744 Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java trunk/lima-main/src/main/java/org/chorem/lima/Main.java trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/MainViewHandler.java trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties Log: - improve progress bar use : make it modal and center of main ui - add fullscreen - normal screen actions Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaConfig.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -20,13 +20,10 @@ /** * La configuration de l'application. * <p/> - * Note : cette classe sera auto-instanciée par le contexte applicatif. - * <p/> * TODO ajouter d'autres propriete pour controler quel storage est utilise * et quel est son type (local ou pas). * * @author chemit - * @see jaxx.runtime.DefaultApplicationContext.AutoLoad */ public class LimaConfig extends org.nuiton.util.ApplicationConfig { @@ -187,7 +184,7 @@ } public static final String[] DEFAULT_JAXX_PCS = { - "fullScreen" + "fullScreen", "locale" }; public void removeJaxxPropertyChangeListener() { Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -126,15 +126,6 @@ DTOHelper.setLocale(locale); } -// public void dispose(boolean reload) { -// -// disposeUI(); -// -// if (reload) { -// Main.launch(this); -// } -// } - public ServiceFactory getNeogiaFactory() { if (neogiaFactory == null) { neogiaFactory = ServiceFactory.getServiceFactory(); @@ -144,11 +135,6 @@ public MainViewImpl getMainUI() { return (MainViewImpl) MAIN_UI_ENTRY_DEF.getContextValue(this); -// if (mainUI == null) { -// log.debug("getMainUI"); -// mainUI = new MainViewImpl(); -// } -// return mainUI; } public DataManager getDataManager() { @@ -158,13 +144,6 @@ return dataManager; } -// public void disposeUI() { -// MainView mainUI = getMainUI(); -// if (mainUI != null) { -// mainUI.dispose(); -// } -// } - /** * close the application's context. * @@ -177,14 +156,15 @@ // fermeture du context principal MainView mainUI = getMainUI(); - if (mainUI != null) { + if (mainUI != null && mainUI.isVisible()) { + mainUI.setVisible(false); mainUI.dispose(); } if (log.isDebugEnabled()) { - log.debug("context closed" + this); + log.debug("context closed " + this); } - System.exit(0); + //System.exit(0); } public static LimaContext getContext() { Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -151,7 +151,7 @@ return context; } - public static void launch(final LimaContext context) { + public static void launch(final LimaContext context) throws Exception { MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class); @@ -160,6 +160,19 @@ log.info(_("lima.init.ui.done")); + final ProgressBarImpl b = new ProgressBarImpl(ui, ui); + + // show ui + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + ui.setVisible(true); + b.setVisible(true); + } + }); + + Thread.sleep(100); /** * Lancement de la barre de chargement * L'application va charger en mémoire les données @@ -168,13 +181,13 @@ @Override public void run() { - ProgressBarImpl b = new ProgressBarImpl(); - b.setModal(true); +// ProgressBarImpl b = new ProgressBarImpl(ui, ui); // Chargement des journaux b.getProgressBar().setString("5% : " + _("lima.progressBar.load.etape1")); - b.getProgressBar().setValue(0); + b.getProgressBar().setValue(5); DataManager dataManager = context.getDataManager(); dataManager.getJournalModel(); + // Chargement des comptes b.getProgressBar().setString("30% : " + _("lima.progressBar.load.etape2")); b.getProgressBar().setValue(30); @@ -185,26 +198,29 @@ b.getProgressBar().setString("50% : " + _("lima.progressBar.load.etape3")); b.getProgressBar().setValue(50); dataManager.getStatus(); + // Chargement des periodes b.getProgressBar().setString("60% : " + _("lima.progressBar.load.etape4")); b.getProgressBar().setValue(60); dataManager.getPeriodes(); + // Chargement des transactions b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5")); b.getProgressBar().setValue(70); dataManager.getTransactionModel(b.getProgressBar()); b.dispose(); + } }.start(); - // show ui - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.setVisible(true); - } - }); +// // show ui +// SwingUtilities.invokeLater(new Runnable() { +// +// @Override +// public void run() { +// ui.setVisible(true); +// } +// }); } public static class ShutdownHook extends Thread { Modified: trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -27,6 +27,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; +import org.chorem.lima.ui.MainViewImpl; import org.jdom.*; import org.jdom.output.*; import org.chorem.lima.dto.AccountDTO; @@ -39,7 +40,9 @@ import org.chorem.lima.util.Util; import static org.nuiton.i18n.I18n._; +import javax.swing.*; + /** * Permet d'exporter les données dans un document xml. * @@ -47,7 +50,9 @@ */ public class XMLExport { - /** log */ + /** + * log + */ protected static final Log log = LogFactory.getLog(XMLExport.class); private static Element racine = new Element("Callao"); @@ -66,154 +71,167 @@ private static List<TransactionDTO> listTransactionDTO = LimaContext.getContext().getDataManager().getTransactionModel().getData(); - /** * Cete méthode permet d'exporter des données de Callao vers un fichier au * format xml. + * * @param pathFile * @return */ - public String exportFile(String pathFile) - { + public String exportFile(String pathFile) { if (log.isDebugEnabled()) { log.debug("Save file XML : "); } // Charge le nom du fichier file = pathFile; // Mise en place de la barre de progression - new Thread() - { + MainViewImpl context = LimaContext.get().getMainUI(); + progressBar = new ProgressBarImpl(context, context); + Runnable runnable = new Runnable() { + public void run() { + progressBar.setVisible(true); + } + }; + SwingUtilities.invokeLater(runnable); + new Thread() { @Override - public void run() - { - progressBar = new ProgressBarImpl(); - progressBar.setTitle(_("lima.progressBar.export.title")); - progressBar.getProgressBar().setString("0% : "+_("lima.progressBar.export.etape1")); - progressBar.getProgressBar().setValue(0); + public void run() { +// MainViewImpl context = LimaContext.get().getMainUI(); +// progressBar = new ProgressBarImpl(context, context); + progressBar.setTitle(_("lima.progressBar.export.title")); + progressBar.getProgressBar().setString("0% : " + _("lima.progressBar.export.etape1")); + progressBar.getProgressBar().setValue(0); - /** - * Partie Informations - */ - progressBar.getProgressBar().setString("10% : "+_("lima.progressBar.export.etape2")); - progressBar.getProgressBar().setValue(10); - Element info = new Element("informations"); - racine.addContent(info); - Attribute date = new Attribute("date",new Date().toString()); - info.setAttribute(date); - Attribute user = new Attribute("user","Name user"); - info.setAttribute(user); - Attribute company = new Attribute("company","Name company"); - info.setAttribute(company); - /** - * Partie Save - */ - // Création Element save - Element save = new Element("save"); - racine.addContent(save); - /** - * Period - */ - progressBar.getProgressBar().setString("25% : "+_("lima.progressBar.export.etape3")); - progressBar.getProgressBar().setValue(25); - Element periods = new Element("periods"); - Element timeSpans = new Element("timespans"); - save.addContent(periods); - save.addContent(timeSpans); - exportPeriod(periods,timeSpans); - /** - * Journal - */ - progressBar.getProgressBar().setString("35% : "+_("lima.progressBar.export.etape4")); - progressBar.getProgressBar().setValue(35); - Element journals = new Element("journals"); - save.addContent(journals); - exportJournal(journals); - /** - * Account - */ - progressBar.getProgressBar().setString("50% : "+_("lima.progressBar.export.etape5")); - progressBar.getProgressBar().setValue(50); - Element accounts = new Element("accounts"); - save.addContent(accounts); - // Appel une fonction récursive pour parcourir l'arborescence des comptes - accountXML(AccountMasterDTO.getChildren(),accounts); - /** - * Transaction - */ - progressBar.getProgressBar().setString("60% : "+_("lima.progressBar.export.etape6")); - progressBar.getProgressBar().setValue(60); - Element transactions = new Element("transactions"); - save.addContent(transactions); - Element entries = new Element("entries"); - save.addContent(entries); - exportTransaction(transactions,entries,progressBar); - /** - * Enregistre le fichier - */ - progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7")); - progressBar.getProgressBar().setValue(100); - enregistre(file); - progressBar.dispose(); - + /** + * Partie Informations + */ + progressBar.getProgressBar().setString("10% : " + _("lima.progressBar.export.etape2")); + progressBar.getProgressBar().setValue(10); + Element info = new Element("informations"); + racine.addContent(info); + Attribute date = new Attribute("date", new Date().toString()); + info.setAttribute(date); + Attribute user = new Attribute("user", "Name user"); + info.setAttribute(user); + Attribute company = new Attribute("company", "Name company"); + info.setAttribute(company); + /** + * Partie Save + */ + // Création Element save + Element save = new Element("save"); + racine.addContent(save); + /** + * Period + */ + progressBar.getProgressBar().setString("25% : " + _("lima.progressBar.export.etape3")); + progressBar.getProgressBar().setValue(25); + Element periods = new Element("periods"); + Element timeSpans = new Element("timespans"); + save.addContent(periods); + save.addContent(timeSpans); + exportPeriod(periods, timeSpans); + /** + * Journal + */ + progressBar.getProgressBar().setString("35% : " + _("lima.progressBar.export.etape4")); + progressBar.getProgressBar().setValue(35); + Element journals = new Element("journals"); + save.addContent(journals); + exportJournal(journals); + /** + * Account + */ + progressBar.getProgressBar().setString("50% : " + _("lima.progressBar.export.etape5")); + progressBar.getProgressBar().setValue(50); + Element accounts = new Element("accounts"); + save.addContent(accounts); + // Appel une fonction récursive pour parcourir l'arborescence des comptes + accountXML(AccountMasterDTO.getChildren(), accounts); + /** + * Transaction + */ + progressBar.getProgressBar().setString("60% : " + _("lima.progressBar.export.etape6")); + progressBar.getProgressBar().setValue(60); + Element transactions = new Element("transactions"); + save.addContent(transactions); + Element entries = new Element("entries"); + save.addContent(entries); + exportTransaction(transactions, entries, progressBar); + /** + * Enregistre le fichier + */ + progressBar.getProgressBar().setString("100% : " + _("lima.progressBar.export.etape7")); + progressBar.getProgressBar().setValue(100); + enregistre(file); + progressBar.dispose(); + } }.start(); return ServiceHelper.RESPOND_SUCCESS; } - public String exportAccount (String pathFile) - { + public String exportAccount(String pathFile) { if (log.isDebugEnabled()) { log.debug("Save Account XML : "); } // Charge le nom du fichier file = pathFile; + + MainViewImpl context = LimaContext.get().getMainUI(); + progressBar = new ProgressBarImpl(context, context); + Runnable runnable = new Runnable() { + public void run() { + progressBar.setVisible(true); + } + }; + SwingUtilities.invokeLater(runnable); + // Mise en place de la barre de progression - new Thread() - { + new Thread() { @Override - public void run() - { - String i18; - progressBar = new ProgressBarImpl(); - progressBar.setTitle(_("lima.progressBar.export.title")); - progressBar.getProgressBar().setString("0% : "+_("lima.progressBar.export.etape1")); - progressBar.getProgressBar().setValue(0); - /** - * Partie Informations - */ - progressBar.getProgressBar().setString("10% : "+_("lima.progressBar.export.etape2")); - progressBar.getProgressBar().setValue(10); - Element info = new Element("informations"); - racine.addContent(info); - Attribute date = new Attribute("date",new Date().toString()); - info.setAttribute(date); - Attribute user = new Attribute("user","Name user"); - info.setAttribute(user); - Attribute company = new Attribute("company","Name company"); - info.setAttribute(company); - /** - * Partie Save - */ - // Création Element save - Element save = new Element("save"); - racine.addContent(save); - /** - * Account - */ - progressBar.getProgressBar().setString("50% : "+_("lima.progressBar.export.etape5")); - progressBar.getProgressBar().setValue(50); - Element accounts = new Element("accounts"); - save.addContent(accounts); - // Appel une fonction récursive pour parcourir l'arborescence des comptes - accountXML(AccountMasterDTO.getChildren(),accounts); - /** - * Enregistre le fichier - */ - progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7")); - progressBar.getProgressBar().setValue(100); - enregistre(file); - progressBar.dispose(); + public void run() { +// MainViewImpl context = LimaContext.get().getMainUI(); +// progressBar = new ProgressBarImpl(context, context); + progressBar.setTitle(_("lima.progressBar.export.title")); + progressBar.getProgressBar().setString("0% : " + _("lima.progressBar.export.etape1")); + progressBar.getProgressBar().setValue(0); + /** + * Partie Informations + */ + progressBar.getProgressBar().setString("10% : " + _("lima.progressBar.export.etape2")); + progressBar.getProgressBar().setValue(10); + Element info = new Element("informations"); + racine.addContent(info); + Attribute date = new Attribute("date", new Date().toString()); + info.setAttribute(date); + Attribute user = new Attribute("user", "Name user"); + info.setAttribute(user); + Attribute company = new Attribute("company", "Name company"); + info.setAttribute(company); + /** + * Partie Save + */ + // Création Element save + Element save = new Element("save"); + racine.addContent(save); + /** + * Account + */ + progressBar.getProgressBar().setString("50% : " + _("lima.progressBar.export.etape5")); + progressBar.getProgressBar().setValue(50); + Element accounts = new Element("accounts"); + save.addContent(accounts); + // Appel une fonction récursive pour parcourir l'arborescence des comptes + accountXML(AccountMasterDTO.getChildren(), accounts); + /** + * Enregistre le fichier + */ + progressBar.getProgressBar().setString("100% : " + _("lima.progressBar.export.etape7")); + progressBar.getProgressBar().setValue(100); + enregistre(file); + progressBar.dispose(); } }.start(); return ServiceHelper.RESPOND_SUCCESS; @@ -221,45 +239,41 @@ /** - * * @param periods * @param timeSpans */ - public void exportPeriod (Element periods,Element timeSpans) - { + public void exportPeriod(Element periods, Element timeSpans) { // Pour chaque période - for (PeriodDTO periodDTO : listPeriodDTO) - { + for (PeriodDTO periodDTO : listPeriodDTO) { // Création élément périod Element period = new Element("period"); periods.addContent(period); // Identifiant période - Attribute id = new Attribute("id",periodDTO.getIdSeq()); + Attribute id = new Attribute("id", periodDTO.getIdSeq()); period.setAttribute(id); // BeginPeriod // Découpage date String dateTab[] = Util.arrayDate(periodDTO.getBegin()); - Attribute beginYear = new Attribute("beginYear",dateTab[0]); + Attribute beginYear = new Attribute("beginYear", dateTab[0]); period.setAttribute(beginYear); - Attribute beginMonth = new Attribute("beginMonth",dateTab[1]); + Attribute beginMonth = new Attribute("beginMonth", dateTab[1]); period.setAttribute(beginMonth); - Attribute beginDay = new Attribute("beginDay",dateTab[2]); + Attribute beginDay = new Attribute("beginDay", dateTab[2]); period.setAttribute(beginDay); // EndPeriod dateTab = Util.arrayDate(periodDTO.getEnd()); - Attribute endYear = new Attribute("endYear",dateTab[0]); + Attribute endYear = new Attribute("endYear", dateTab[0]); period.setAttribute(endYear); - Attribute endMonth = new Attribute("endMonth",dateTab[1]); + Attribute endMonth = new Attribute("endMonth", dateTab[1]); period.setAttribute(endMonth); - Attribute endDay = new Attribute("endDay",dateTab[2]); + Attribute endDay = new Attribute("endDay", dateTab[2]); period.setAttribute(endDay); // Locked Period - if ( periodDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE) ) - { - Attribute locked = new Attribute("locked","true"); + if (periodDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE)) { + Attribute locked = new Attribute("locked", "true"); period.setAttribute(locked); } else { - Attribute locked = new Attribute("locked","false"); + Attribute locked = new Attribute("locked", "false"); period.setAttribute(locked); } /** @@ -268,39 +282,37 @@ // Recherche des timeSpans de la période List<PeriodDTO> listTimeSpanDTO = periodDTO.getChildren(); // Pour chaque timeSpan - for (PeriodDTO timeSpanDTO : listTimeSpanDTO) - { + for (PeriodDTO timeSpanDTO : listTimeSpanDTO) { Element timeSpan = new Element("timespan"); timeSpans.addContent(timeSpan); // Identifiant timeSpan - Attribute idTimeSpan = new Attribute("id",timeSpanDTO.getIdSeq()); + Attribute idTimeSpan = new Attribute("id", timeSpanDTO.getIdSeq()); timeSpan.setAttribute(idTimeSpan); - Attribute idPeriod = new Attribute("idPeriod",periodDTO.getIdSeq()); + Attribute idPeriod = new Attribute("idPeriod", periodDTO.getIdSeq()); timeSpan.setAttribute(idPeriod); // Begin TimeSpan // Découpage date dateTab = Util.arrayDate(timeSpanDTO.getBegin()); - Attribute beginYearTimeSpan = new Attribute("beginYear",dateTab[0]); + Attribute beginYearTimeSpan = new Attribute("beginYear", dateTab[0]); timeSpan.setAttribute(beginYearTimeSpan); - Attribute beginMonthTimeSpan = new Attribute("beginMonth",dateTab[1]); + Attribute beginMonthTimeSpan = new Attribute("beginMonth", dateTab[1]); timeSpan.setAttribute(beginMonthTimeSpan); - Attribute beginDayTimeSpan = new Attribute("beginDay",dateTab[2]); + Attribute beginDayTimeSpan = new Attribute("beginDay", dateTab[2]); timeSpan.setAttribute(beginDayTimeSpan); // End TimeSpan dateTab = Util.arrayDate(timeSpanDTO.getEnd()); - Attribute endYearTimeSpan = new Attribute("endYear",dateTab[0]); + Attribute endYearTimeSpan = new Attribute("endYear", dateTab[0]); timeSpan.setAttribute(endYearTimeSpan); - Attribute endMonthTimeSpan = new Attribute("endMonth",dateTab[1]); + Attribute endMonthTimeSpan = new Attribute("endMonth", dateTab[1]); timeSpan.setAttribute(endMonthTimeSpan); - Attribute endDayTimeSpan = new Attribute("endDay",dateTab[2]); + Attribute endDayTimeSpan = new Attribute("endDay", dateTab[2]); timeSpan.setAttribute(endDayTimeSpan); // Lock timeSpan - if ( timeSpanDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE) ) - { - Attribute locked = new Attribute("locked","true"); + if (timeSpanDTO.getStatus().getIdName().equals(ServiceHelper.PE_CLOSE)) { + Attribute locked = new Attribute("locked", "true"); timeSpan.setAttribute(locked); } else { - Attribute locked = new Attribute("locked","false"); + Attribute locked = new Attribute("locked", "false"); timeSpan.setAttribute(locked); } } @@ -308,26 +320,23 @@ } /** - * * @param journals */ - public void exportJournal (Element journals) - { - for (JournalDTO journalDTO : listJournalDTO) - { - Element journal = new Element ("journal"); + public void exportJournal(Element journals) { + for (JournalDTO journalDTO : listJournalDTO) { + Element journal = new Element("journal"); journals.addContent(journal); // Identification du journal - Attribute idJournal = new Attribute ("id",journalDTO.getIdSeq()); + Attribute idJournal = new Attribute("id", journalDTO.getIdSeq()); journal.setAttribute(idJournal); // Label - Attribute label = new Attribute ("label",journalDTO.getIdName()); + Attribute label = new Attribute("label", journalDTO.getIdName()); journal.setAttribute(label); // Prefix - Attribute prefix = new Attribute ("prefix",journalDTO.getPrefix()); + Attribute prefix = new Attribute("prefix", journalDTO.getPrefix()); journal.setAttribute(prefix); // Description - Attribute description = new Attribute ("description",journalDTO.getDescription()); + Attribute description = new Attribute("description", journalDTO.getDescription()); journal.setAttribute(description); } } @@ -335,132 +344,126 @@ /** * Converti la liste des comptes pour être ajouté au document xml. + * * @param listAccountDTO * @param accounts */ - public void accountXML(List<AccountDTO> listAccountDTO,Element accounts) - { - for (AccountDTO accountDTO : listAccountDTO) - { - Element account = new Element ("account"); + public void accountXML(List<AccountDTO> listAccountDTO, Element accounts) { + for (AccountDTO accountDTO : listAccountDTO) { + Element account = new Element("account"); accounts.addContent(account); // Identification du account - Attribute idAccount = new Attribute ("id",accountDTO.getIdSeq()); + Attribute idAccount = new Attribute("id", accountDTO.getIdSeq()); account.setAttribute(idAccount); // Label - Attribute label = new Attribute ("label",accountDTO.getDescription()); + Attribute label = new Attribute("label", accountDTO.getDescription()); account.setAttribute(label); // Type - Attribute type = new Attribute ("type",accountDTO.getType()); + Attribute type = new Attribute("type", accountDTO.getType()); account.setAttribute(type); // AccountNumber - Attribute accountNumber = new Attribute ("accountNumber",accountDTO.getIdNumber()); + Attribute accountNumber = new Attribute("accountNumber", accountDTO.getIdNumber()); account.setAttribute(accountNumber); // MasterAccountNumber - Attribute masterAccountNumber = new Attribute ("masterAccount",accountDTO.getParent().getIdNumber()); + Attribute masterAccountNumber = new Attribute("masterAccount", accountDTO.getParent().getIdNumber()); account.setAttribute(masterAccountNumber); // Ajoute les comptes enfants à la liste - accountXML(accountDTO.getChildren(),accounts); + accountXML(accountDTO.getChildren(), accounts); } } - public void exportTransaction (Element transactions,Element entries,ProgressBarImpl progressBar) - { + public void exportTransaction(Element transactions, Element entries, ProgressBarImpl progressBar) { // Nombre de transaction float nbTransactions = listTransactionDTO.size(); float incremente = 20 / nbTransactions; float value = 80; // Pour chaque transaction - for (TransactionDTO transactionDTO : listTransactionDTO) - { - Element transaction = new Element ("transaction"); + for (TransactionDTO transactionDTO : listTransactionDTO) { + Element transaction = new Element("transaction"); transactions.addContent(transaction); // Identification de la transaction - Attribute idTransaction = new Attribute ("id",transactionDTO.getIdSeq()); + Attribute idTransaction = new Attribute("id", transactionDTO.getIdSeq()); transaction.setAttribute(idTransaction); // EntryDate String dateTab[] = Util.arrayDate(transactionDTO.getEntryDate()); - Attribute entryDateYear = new Attribute ("entryDateYear",dateTab[0]); + Attribute entryDateYear = new Attribute("entryDateYear", dateTab[0]); transaction.setAttribute(entryDateYear); - Attribute entryDateMonth = new Attribute ("entryDateMonth",dateTab[1]); + Attribute entryDateMonth = new Attribute("entryDateMonth", dateTab[1]); transaction.setAttribute(entryDateMonth); - Attribute entryDateDay = new Attribute ("entryDateDay",dateTab[2]); + Attribute entryDateDay = new Attribute("entryDateDay", dateTab[2]); transaction.setAttribute(entryDateDay); // VoucherRef - Attribute voucherRef = new Attribute ("voucherRef",transactionDTO.getVoucherRef()); + Attribute voucherRef = new Attribute("voucherRef", transactionDTO.getVoucherRef()); transaction.setAttribute(voucherRef); // Description - Attribute description = new Attribute ("description",transactionDTO.getDescription()); + Attribute description = new Attribute("description", transactionDTO.getDescription()); transaction.setAttribute(description); // Id journal - Attribute IdJournal = new Attribute ("idJournal",transactionDTO.getJournal().getIdSeq()); + Attribute IdJournal = new Attribute("idJournal", transactionDTO.getJournal().getIdSeq()); transaction.setAttribute(IdJournal); // Id timeSpan - Attribute IdTimeSpan = new Attribute ("idTimeSpan",transactionDTO.getPeriod().getIdSeq()); + Attribute IdTimeSpan = new Attribute("idTimeSpan", transactionDTO.getPeriod().getIdSeq()); transaction.setAttribute(IdTimeSpan); /** * Entry */ List<EntryDTO> listEntryDTO = transactionDTO.getEntries(); - for (EntryDTO entryDTO : listEntryDTO) - { - Element entry = new Element ("entry"); + for (EntryDTO entryDTO : listEntryDTO) { + Element entry = new Element("entry"); entries.addContent(entry); // Identification du entry - Attribute idEntry = new Attribute ("id",entryDTO.getIdSeq()); + Attribute idEntry = new Attribute("id", entryDTO.getIdSeq()); entry.setAttribute(idEntry); // Description - Attribute descriptionEntry = new Attribute ("description",entryDTO.getDescription()); + Attribute descriptionEntry = new Attribute("description", entryDTO.getDescription()); entry.setAttribute(descriptionEntry); // Amount - Attribute amount = new Attribute ("amount",entryDTO.getAmount()); + Attribute amount = new Attribute("amount", entryDTO.getAmount()); entry.setAttribute(amount); // Lettering - Attribute lettering = new Attribute ("lettering",entryDTO.getLettrage()); + Attribute lettering = new Attribute("lettering", entryDTO.getLettrage()); entry.setAttribute(lettering); // Detail - Attribute detail = new Attribute ("detail",entryDTO.getDescription()); + Attribute detail = new Attribute("detail", entryDTO.getDescription()); entry.setAttribute(detail); // Debit / crédit - if ( entryDTO.getDebit() ) - { - Attribute debit = new Attribute("debit","true"); + if (entryDTO.getDebit()) { + Attribute debit = new Attribute("debit", "true"); entry.setAttribute(debit); } else { - Attribute debit = new Attribute("debit","false"); + Attribute debit = new Attribute("debit", "false"); entry.setAttribute(debit); } // Transaction - Attribute idrefTransaction = new Attribute ("idTransaction",transactionDTO.getIdSeq()); + Attribute idrefTransaction = new Attribute("idTransaction", transactionDTO.getIdSeq()); entry.setAttribute(idrefTransaction); // Account - Attribute idAccount = new Attribute ("idAccount",entryDTO.getAccount().getIdSeq()); + Attribute idAccount = new Attribute("idAccount", entryDTO.getAccount().getIdSeq()); entry.setAttribute(idAccount); } // Mise à jour de la barre de chargement value = value + incremente; - progressBar.getProgressBar().setValue((int)value); - progressBar.getProgressBar().setString(value+"% : "+_("lima.progressBar.export.etape6")); - + progressBar.getProgressBar().setValue((int) value); + progressBar.getProgressBar().setString(value + "% : " + _("lima.progressBar.export.etape6")); + } } /** * Permet d'enregistrer le fichier xml. + * * @param fichier */ - static void enregistre(String fichier) - { - try - { - XMLOutputter sortie = new XMLOutputter(Format.getPrettyFormat()); - sortie.output(document, new FileOutputStream(fichier)); - } - catch (java.io.IOException e){ + static void enregistre(String fichier) { + try { + XMLOutputter sortie = new XMLOutputter(Format.getPrettyFormat()); + sortie.output(document, new FileOutputStream(fichier)); + } + catch (java.io.IOException e) { log.error(e); - } + } } } Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -163,17 +163,25 @@ passifTab.get("PASSIF").add(passifTab.get("PASSIF_DETTES")); } - /** * Permet de calculer le bilan */ public void updateBilan() { log.debug("Update bilan :"); + MainViewImpl context = LimaContext.get().getMainUI(); + progressBar = new ProgressBarImpl(context, context); + Runnable runnable = new Runnable() { + public void run() { + progressBar.setVisible(true); + } + }; + SwingUtilities.invokeLater(runnable); + new Thread() { @Override public void run() { - progressBar = new ProgressBarImpl(); + progressBar.setTitle("Chargement du bilan"); progressBar.getProgressBar().setString("0% : Préparation des données"); progressBar.getProgressBar().setValue(0); Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/MainView.jaxx 2009-11-08 15:26:23 UTC (rev 2744) @@ -1,5 +1,7 @@ <JFrame title="lima.title" onWindowClosing="getHandler().close(this)" - defaultCloseOperation="do_nothing_on_close" resizable="true" width="800" height="600" + defaultCloseOperation="do_nothing_on_close" + undecorated='{getConfig().isFullScreen()}' + resizable="true" width="800" height="600" extendedState='{this.MAXIMIZED_BOTH}'> <style source="css/lima.css"/> <script><![CDATA[ @@ -59,7 +61,21 @@ <JMenuItem text="lima.print" actionIcon='print'/> <JSeparator/> - + <JMenuItem id='menuFileFullscreen' + text="lima.action.fullscreen" + toolTipText="lima.action.fullscreen.tip" + actionIcon="fullscreen" + mnemonic="P" + visible="{!isUndecorated()}" + onActionPerformed="getHandler().changeScreen(this, true)"/> + <JMenuItem id='menuFileNormalscreen' + text="lima.action.normalscreen" + toolTipText="lima.action.normalscreen.tip" + actionIcon="leave-fullscreen" + mnemonic="N" + visible="{isUndecorated()}" + onActionPerformed="getHandler().changeScreen(this, false)"/> + <JSeparator/> <JMenuItem mnemonic="{'Q'}" actionIcon='quit' text="lima.quit" onActionPerformed='getHandler().close(this)'/> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/MainViewHandler.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -10,7 +10,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaConfig; import org.chorem.lima.LimaContext; -import org.chorem.lima.Main; import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; @@ -77,10 +76,8 @@ return; } try { - ui.dispose(); + LimaContext.get().close(); - Main.ShutdownHook.interrupted(); - //LimaContext.get().close(); Runtime.getRuntime().halt(0); } catch (Exception ex) { Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx 2009-11-08 15:26:23 UTC (rev 2744) @@ -1,8 +1,21 @@ <JDialog title="lima.loading" width="620" height="70" id="progressBarFrame" + alwaysOnTop='true' + modal='true' iconImage='{Toolkit.getDefaultToolkit().getImage(getClass().getResource("/icons/lima.png"))}'> <script> - progressBarFrame.setLocationRelativeTo(null); +public ProgressBar(jaxx.runtime.JAXXContext context,Window parent) { + super(parent); + Util.initContext(this, context); + SwingUtil.center(parent, this); + //setLocationRelativeTo(parent); +} + + //progressBarFrame.setEnabled(true); + //progressBarFrame.setAlwaysOnTop(true); + //progressBarFrame.setVisible(true); + //progressBar.setStringPainted(true); + //progressBarFrame.setLocationRelativeTo(null); </script> - <JProgressBar foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar"/> + <JProgressBar stringPainted='true' foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar"/> </JDialog> \ No newline at end of file Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBarImpl.java 2009-11-08 15:26:23 UTC (rev 2744) @@ -19,10 +19,12 @@ package org.chorem.lima.ui; +import java.awt.*; import java.io.IOException; import java.net.URL; import javax.swing.JOptionPane; +import jaxx.runtime.JAXXContext; import org.chorem.lima.LimaContext; import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; @@ -42,19 +44,33 @@ */ private static final Log log = LogFactory.getLog(ProgressBarImpl.class); - public ProgressBarImpl() { - //progressBar.setVisible(true); + public ProgressBarImpl(JAXXContext parentContext, Window parent) { + super(parentContext,parent); + progressBar.setVisible(true); if (log.isDebugEnabled()) { log.debug("Lancement barre de progression..."); } - progressBarFrame.setEnabled(true); - progressBarFrame.setAlwaysOnTop(true); - progressBarFrame.setVisible(true); + //progressBarFrame.setEnabled(true); + //progressBarFrame.setAlwaysOnTop(true); + //progressBarFrame.setVisible(true); + //progressBarFrame.setModal(true); //progressBarFrame.setLocationRelativeTo(null); - progressBar.setStringPainted(true); - + //progressBar.setStringPainted(true); } +// public ProgressBarImpl() { +// //progressBar.setVisible(true); +// if (log.isDebugEnabled()) { +// log.debug("Lancement barre de progression..."); +// } +// progressBarFrame.setEnabled(true); +// progressBarFrame.setAlwaysOnTop(true); +// progressBarFrame.setVisible(true); +// //progressBarFrame.setLocationRelativeTo(null); +// progressBar.setStringPainted(true); +// +// } + public void loadDefaultAccount(AccountDTO accountRoot) { if (log.isDebugEnabled()) { log.debug("Account root : " + accountRoot); Modified: trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/resources/i18n/lima-main-en_GB.properties 2009-11-08 15:26:23 UTC (rev 2744) @@ -4,6 +4,10 @@ lima.actif=Asset lima.action.commandline.disable.main.ui=Do not launch main ui lima.action.commandline.help=Show help in console +lima.action.fullscreen=Full screen +lima.action.fullscreen.tip=Open ui in full screen +lima.action.normalscreen=Normal screen +lima.action.normalscreen.tip=Open ui in normal screen lima.add=Add lima.add.entry=Add an entry lima.add.lettering=Add a letter @@ -14,7 +18,7 @@ lima.any.criteria=Any criteria are met lima.balance=Balance lima.balance.account.libelle=Title -lima.balance.account.number=N\u00B0 account +lima.balance.account.number=N\u00b0 account lima.balance.move.credit=Credit lima.balance.move.debit=Debit lima.balance.solde.credit=Balance credit @@ -109,7 +113,7 @@ lima.import.error=Your datas had't not been loaded lima.import.journal=Import journal lima.import.success=Your datas had been loaded -lima.init.closed= +lima.init.closed=Lima closed at %1$s lima.init.context.done=Context was initialized in %1$s lima.init.ui.done=UI initialized lima.journal=Journal @@ -188,7 +192,7 @@ lima.result.charge=CHARGES lima.result.loss=Perte lima.result.produit=PRODUITS -lima.result.profit=B\u00E9n\u00E9fice +lima.result.profit=B\u00e9n\u00e9fice lima.result.total.charge=TOTAL CHARGES lima.result.total.produit=TOTAL PRODUITS lima.search=Search Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-08 15:18:38 UTC (rev 2743) +++ trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-08 15:26:23 UTC (rev 2744) @@ -4,21 +4,25 @@ lima.actif=Actif lima.action.commandline.disable.main.ui=Ne pas lancer l'ui lima.action.commandline.help=Afficher l'aide en console +lima.action.fullscreen=Plein Ecran +lima.action.fullscreen.tip=Passer en mode plein \u00e9cran +lima.action.normalscreen=Ecran normal +lima.action.normalscreen.tip=Revenir en \u00e9cran normal lima.add=Ajout -lima.add.entry=Ajouter une entr\u00E9e +lima.add.entry=Ajouter une entr\u00e9e lima.add.lettering=Ajouter une lettre lima.add.transaction=Ajouter une transaction lima.all=Tous -lima.all.criteria=Tous les crit\u00E8res correspondent +lima.all.criteria=Tous les crit\u00e8res correspondent lima.amount=Montant lima.any.criteria=Au moins un critcre correspond lima.balance=Balance -lima.balance.account.libelle=Libell\u00E9 -lima.balance.account.number=N\u00B0 de compte -lima.balance.move.credit=Mouvement au cr\u00E9dit -lima.balance.move.debit=Mouvement au d\u00E9bit -lima.balance.solde.credit=Solde cr\u00E9dit -lima.balance.solde.debit=Solde d\u00E9bit +lima.balance.account.libelle=Libell\u00e9 +lima.balance.account.number=N\u00b0 de compte +lima.balance.move.credit=Mouvement au cr\u00e9dit +lima.balance.move.debit=Mouvement au d\u00e9bit +lima.balance.solde.credit=Solde cr\u00e9dit +lima.balance.solde.debit=Solde d\u00e9bit lima.balance.total=Total lima.bilan=Bilan lima.bilan.actif=Actif @@ -30,22 +34,22 @@ lima.block=Bloquer lima.cancel=Annuler lima.charge=Charge -lima.closure.period.begin=P\u00E9riode du -lima.closure.timespan.warning=Attention \: lorsque la p\u00E9riode est bloqu\u00E9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u00E9es comptables sur cette p\u00E9riode. -lima.config.category.directories=R\u00E9pertoires -lima.config.category.directories.description=R\u00E9pertoires utilis\u00E9s par Lima +lima.closure.period.begin=P\u00e9riode du +lima.closure.timespan.warning=Attention \: lorsque la p\u00e9riode est bloqu\u00e9e, il n'est plus possible d'ajouter, modifier et supprimer les entr\u00e9es comptables sur cette p\u00e9riode. +lima.config.category.directories=R\u00e9pertoires +lima.config.category.directories.description=R\u00e9pertoires utilis\u00e9s par Lima lima.config.category.other=Autre -lima.config.category.other.description=Autre propri\u00E9t\u00E9s de configuration +lima.config.category.other.description=Autre propri\u00e9t\u00e9s de configuration lima.config.configFileName.description= -lima.config.locale.description=Locale utilis\u00E9e par l'application -lima.config.ui.fullscreen=Drapeau pour utiliser le mode plein \u00E9cran +lima.config.locale.description=Locale utilis\u00e9e par l'application +lima.config.ui.fullscreen=Drapeau pour utiliser le mode plein \u00e9cran lima.credit=Credit lima.daily=Quotidien lima.date=Date lima.date.april=Avril -lima.date.august=Ao\u00FBt -lima.date.december=D\u00E9cembre -lima.date.february=F\u00E9vrier +lima.date.august=Ao\u00fbt +lima.date.december=D\u00e9cembre +lima.date.february=F\u00e9vrier lima.date.january=Janvier lima.date.july=Juillet lima.date.june=Juin @@ -58,44 +62,44 @@ lima.description=Description lima.edit=Editer lima.edit.transaction=Editer une transaction -lima.entries=Lignes d'\u00E9criture +lima.entries=Lignes d'\u00e9criture lima.error=Erreur -lima.error.account.double=Il existe un compte avec ce m\u00EAme num\u00E9ro de compte -lima.error.account.not.exist=Ce num\u00E9ro de compte n'existe pas -lima.error.account.not.master=Ce compte ne poss\u00E8de pas de compte principal -lima.error.account.with.entries=Ce compte poss\u00E8de des entr\u00E9es comptables +lima.error.account.double=Il existe un compte avec ce m\u00eame num\u00e9ro de compte +lima.error.account.not.exist=Ce num\u00e9ro de compte n'existe pas +lima.error.account.not.master=Ce compte ne poss\u00e8de pas de compte principal +lima.error.account.with.entries=Ce compte poss\u00e8de des entr\u00e9es comptables lima.error.entry.not.exist= lima.error.entry.not.remove= -lima.error.journal.double=Un journal poss\u00E8de d\u00E9j\u00E0 ce nom +lima.error.journal.double=Un journal poss\u00e8de d\u00e9j\u00e0 ce nom lima.error.journal.not.exist=Ce journal n'existe pas -lima.error.journal.with.transactions=Ce journal poss\u00E8de des transactions comptables +lima.error.journal.with.transactions=Ce journal poss\u00e8de des transactions comptables lima.error.period.all.timespan= lima.error.period.create.timespan= lima.error.period.next.not.blocked= lima.error.period.not.exist= -lima.error.period.prec.not.blocked=Il existe des p\u00E9riodes pr\u00E9c\u00E9dentes non bloqu\u00E9es +lima.error.period.prec.not.blocked=Il existe des p\u00e9riodes pr\u00e9c\u00e9dentes non bloqu\u00e9es lima.error.period.timespan.block= lima.error.period.timespan.not.blocked= -lima.error.transaction.exist.not.balanced=Il existe des transactions non \u00E9quilibr\u00E9es -lima.error.transaction.not.create=La transaction n'a pu \u00EAtre cr\u00E9\u00E9e +lima.error.transaction.exist.not.balanced=Il existe des transactions non \u00e9quilibr\u00e9es +lima.error.transaction.not.create=La transaction n'a pu \u00eatre cr\u00e9\u00e9e lima.error.transaction.not.exist=La transaction n'existe pas -lima.error.transaction.not.journal=La transaction doit \u00EAtre associ\u00E9e \u00E0 un journal -lima.error.transaction.not.period=La transaction doit \u00EAtre associ\u00E9e \u00E0 une p\u00E9riode -lima.error.transaction.not.remove=La transaction n'a pu \u00EAtre supprim\u00E9e. -lima.error.transaction.period.not.blocked=La p\u00E9riode de la transaction est bloqu\u00E9e. -lima.exception.number.format=Uniquement un format num\u00E9rique est accept\u00E9 +lima.error.transaction.not.journal=La transaction doit \u00eatre associ\u00e9e \u00e0 un journal +lima.error.transaction.not.period=La transaction doit \u00eatre associ\u00e9e \u00e0 une p\u00e9riode +lima.error.transaction.not.remove=La transaction n'a pu \u00eatre supprim\u00e9e. +lima.error.transaction.period.not.blocked=La p\u00e9riode de la transaction est bloqu\u00e9e. +lima.exception.number.format=Uniquement un format num\u00e9rique est accept\u00e9 lima.export=Export lima.export.CSV=CSV lima.export.PDF=PDF lima.export.account=Exporter le PCG -lima.export.all=Exporter toutes les donn\u00E9es (XML) -lima.export.all.csv=Exporter toutes les donn\u00E9es (CSV) -lima.filter.after=Apr\u00E8s +lima.export.all=Exporter toutes les donn\u00e9es (XML) +lima.export.all.csv=Exporter toutes les donn\u00e9es (CSV) +lima.filter.after=Apr\u00e8s lima.filter.before=Avant lima.filter.contains=Contient -lima.filter.equals.to=Egal \u00E0 -lima.filter.greater.than=Sup\u00E9rieur \u00E0 -lima.filter.less.than=Inf\u00E9rieur \u00E0 +lima.filter.equals.to=Egal \u00e0 +lima.filter.greater.than=Sup\u00e9rieur \u00e0 +lima.filter.less.than=Inf\u00e9rieur \u00e0 lima.filter.not.contains=Ne contient pas lima.filter.starts.with=Commence par lima.find.transaction=Rechercher transaction @@ -105,15 +109,15 @@ lima.import.account=Importer le PCG lima.import.all=Importer une nouvelle base (XML) lima.import.all.csv=Importer une nouvelle base (CSV) -lima.import.all.csv.ebp=Importer des donn\u00E9es de EBP -lima.import.error=Vos donn\u00E9es n'ont pu \u00EAtre charg\u00E9es +lima.import.all.csv.ebp=Importer des donn\u00e9es de EBP +lima.import.error=Vos donn\u00e9es n'ont pu \u00eatre charg\u00e9es lima.import.journal=Importer le journal -lima.import.success=Vos donn\u00E9es ont bien \u00E9t\u00E9 charg\u00E9es -lima.init.closed= -lima.init.context.done=Initialisation du context termin\u00E9 en %1$s -lima.init.ui.done=Initialisation des interface graphiques termin\u00E9e +lima.import.success=Vos donn\u00e9es ont bien \u00e9t\u00e9 charg\u00e9es +lima.init.closed=Lima ferm\u00e9 \u00e0 %1$s +lima.init.context.done=Initialisation du context termin\u00e9 en %1$s +lima.init.ui.done=Initialisation des interface graphiques termin\u00e9e lima.journal=Journal -lima.lettered=Lettr\u00E9 +lima.lettered=Lettr\u00e9 lima.lettering=Lettrage lima.loading=Chargement lima.menu.file=Fichier @@ -121,58 +125,58 @@ lima.menu.help.about=A Propos lima.menu.help.help=Afficher l'aide lima.menu.help.i18n=Langue -lima.menu.help.i18n.fr=Fran\u00E7ais +lima.menu.help.i18n.fr=Fran\u00e7ais lima.menu.help.i18n.uk=Anglais -lima.menu.help.site=Acc\u00E9der au site de Lima -lima.menubar.closure=Cl\u00F4ture -lima.menubar.closure.addPeriod=Ajouter une p\u00E9riode -lima.menubar.closure.listperiod=Voir toutes les cl\u00F4tures -lima.menubar.closure.period=Cl\u00F4turer l'exercice -lima.menubar.closure.timespan=Cl\u00F4turer une p\u00E9riode +lima.menu.help.site=Acc\u00e9der au site de Lima +lima.menubar.closure=Cl\u00f4ture +lima.menubar.closure.addPeriod=Ajouter une p\u00e9riode +lima.menubar.closure.listperiod=Voir toutes les cl\u00f4tures +lima.menubar.closure.period=Cl\u00f4turer l'exercice +lima.menubar.closure.timespan=Cl\u00f4turer une p\u00e9riode lima.message.config.loaded= lima.message.error.empty.line=Veuillez choisir un compte lima.model.account=Compte lima.model.balance=Balance -lima.model.credit=Cr\u00E9dit +lima.model.credit=Cr\u00e9dit lima.model.date=Date -lima.model.debit=D\u00E9bit +lima.model.debit=D\u00e9bit lima.model.description=Description lima.model.etat=Etat lima.model.journal=Journal lima.model.lettering=Lettrage lima.model.name=Nom -lima.model.period=P\u00E9riode -lima.model.prefix=Pr\u00E9fixe +lima.model.period=P\u00e9riode +lima.model.prefix=Pr\u00e9fixe lima.model.status=Statut lima.model.voucher=Document lima.name=Nom lima.non.valids.transactions=Ecritures non valides -lima.not.lettered=Non lettr\u00E9 -lima.number=Num\u00E9ro +lima.not.lettered=Non lettr\u00e9 +lima.number=Num\u00e9ro lima.ok=OK lima.passif=Passif -lima.period=P\u00E9riode -lima.period.close=Ferm\u00E9 +lima.period=P\u00e9riode +lima.period.close=Ferm\u00e9 lima.period.open=Ouvert -lima.preferences=Pr\u00E9f\u00E9rences +lima.preferences=Pr\u00e9f\u00e9rences lima.prefix=Prefixe lima.print=Imprimer lima.produit=Produit -lima.progressBar.export.etape1=Cr\u00E9ation base du fichier -lima.progressBar.export.etape2=Cr\u00E9ation informations -lima.progressBar.export.etape3=Cr\u00E9ation des p\u00E9riodes -lima.progressBar.export.etape4=Cr\u00E9ation des journaux -lima.progressBar.export.etape5=Cr\u00E9ation des comptes -lima.progressBar.export.etape6=Cr\u00E9ation des transactions +lima.progressBar.export.etape1=Cr\u00e9ation base du fichier +lima.progressBar.export.etape2=Cr\u00e9ation informations +lima.progressBar.export.etape3=Cr\u00e9ation des p\u00e9riodes +lima.progressBar.export.etape4=Cr\u00e9ation des journaux +lima.progressBar.export.etape5=Cr\u00e9ation des comptes +lima.progressBar.export.etape6=Cr\u00e9ation des transactions lima.progressBar.export.etape7=Enregistrement du fichier lima.progressBar.export.title=Sauvegarde lima.progressBar.load.etape1=Chargement des journaux lima.progressBar.load.etape2=Chargement des comptes lima.progressBar.load.etape3=Chargement des status -lima.progressBar.load.etape4=Chargement des p\u00E9riodes +lima.progressBar.load.etape4=Chargement des p\u00e9riodes lima.progressBar.load.etape5=Chargement des transactions lima.question=Question -lima.question.load.accounts=Il n'y a aucun plan comptable existant dans Lima. Voulez-vous en charger un par d\u00E9faut ? +lima.question.load.accounts=Il n'y a aucun plan comptable existant dans Lima. Voulez-vous en charger un par d\u00e9faut ? lima.question.remove.account=Voulez-vous supprimer ce compte? lima.question.remove.entry=Voulez-vous supprimer cette ligne de transaction? lima.question.remove.journal=Voulez-vous supprimer ce journal? @@ -184,30 +188,30 @@ lima.reports=Rapports lima.response.no=Non lima.response.yes=Oui -lima.result=Compte de r\u00E9sultat +lima.result=Compte de r\u00e9sultat lima.result.charge=CHARGES lima.result.loss=Perte lima.result.produit=PRODUITS -lima.result.profit=B\u00E9n\u00E9fice +lima.result.profit=B\u00e9n\u00e9fice lima.result.total.charge=TOTAL CHARGES lima.result.total.produit=TOTAL PRODUITS lima.search=Rechercher -lima.search.items.where=Trouver les \u00E9critures o\u00F9 -lima.search.title.criteria.box=Crit\u00E8res +lima.search.items.where=Trouver les \u00e9critures o\u00f9 +lima.search.title.criteria.box=Crit\u00e8res lima.since=Depuis -lima.status.tr.balanced=Equilibr\u00E9e -lima.status.tr.finalized=Valid\u00E9e +lima.status.tr.balanced=Equilibr\u00e9e +lima.status.tr.finalized=Valid\u00e9e lima.status.tr.wip=En cours -lima.success=Succ\u00E8s +lima.success=Succ\u00e8s lima.tab.account=Compte lima.tab.balance=Balance lima.tab.bilan=Bilan -lima.tab.closure=Cl\u00F4ture +lima.tab.closure=Cl\u00f4ture lima.tab.home=Accueil lima.tab.journal=Journal lima.tab.lettering=Lettrage lima.tab.reports=Rapports -lima.tab.result=Compte de r\u00E9sultat +lima.tab.result=Compte de r\u00e9sultat lima.tab.search.result=Recherche lima.tab.transaction=Ecriture lima.title=Lutin Invoice Monitoring and Accounting @@ -215,14 +219,14 @@ lima.to=A lima.ui.add.account=Ajouter un compte lima.ui.add.journal=Ajouter un journal -lima.ui.block.timespan=Bloquer une p\u00E9riode mensuelle -lima.ui.unblock.timespan=D\u00E9bloquer une p\u00E9riode mensuelle -lima.ui.update.account=Mettre \u00E0 jour le compte -lima.ui.update.journal=Mettre \u00E0 jour le journal -lima.unblock=D\u00E9bloquer -lima.update=Mettre \u00E0 jour +lima.ui.block.timespan=Bloquer une p\u00e9riode mensuelle +lima.ui.unblock.timespan=D\u00e9bloquer une p\u00e9riode mensuelle +lima.ui.update.account=Mettre \u00e0 jour le compte +lima.ui.update.journal=Mettre \u00e0 jour le journal +lima.unblock=D\u00e9bloquer +lima.update=Mettre \u00e0 jour lima.view=Vue lima.view.flatten=Vue aplatie lima.voucher=Document -lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00E9t\u00E9 trouv\u00E9 -lima.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9. +lima.warning.nimbus.landf=Le look and feel nymbus n'a pas \u00e9t\u00e9 trouv\u00e9 +lima.warning.no.ui=Aucun environnement graphique d\u00e9tect\u00e9.

1 0

r2743 - trunk/lima-main/src/main/resources/icons
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 16:18:38 +0100 (Sun, 08 Nov 2009) New Revision: 2743 Added: trunk/lima-main/src/main/resources/icons/action-fullscreen.png trunk/lima-main/src/main/resources/icons/action-leave-fullscreen.png Log: refactor icons Added: trunk/lima-main/src/main/resources/icons/action-fullscreen.png =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/action-fullscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/lima-main/src/main/resources/icons/action-leave-fullscreen.png =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/action-leave-fullscreen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r2742 - trunk/lima-main/src/main/resources/icons
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:22:28 +0100 (Sun, 08 Nov 2009) New Revision: 2742 Removed: trunk/lima-main/src/main/resources/icons/action/ Log: refactor icons

1 0

r2741 - in trunk/lima-main/src/main/resources/icons: . unused
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:22:17 +0100 (Sun, 08 Nov 2009) New Revision: 2741 Added: trunk/lima-main/src/main/resources/icons/unused/view-sort-descending.png Removed: trunk/lima-main/src/main/resources/icons/view-sort-descending.png Log: refactor icons Copied: trunk/lima-main/src/main/resources/icons/unused/view-sort-descending.png (from rev 2739, trunk/lima-main/src/main/resources/icons/view-sort-descending.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/view-sort-descending.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-main/src/main/resources/icons/view-sort-descending.png =================================================================== (Binary files differ)

1 0

r2740 - in trunk/lima-main/src/main/resources/icons: . action unused unused/action
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:21:23 +0100 (Sun, 08 Nov 2009) New Revision: 2740 Added: trunk/lima-main/src/main/resources/icons/action-closeTab.png trunk/lima-main/src/main/resources/icons/unused/ trunk/lima-main/src/main/resources/icons/unused/accessories-text-editor.png trunk/lima-main/src/main/resources/icons/unused/action/ trunk/lima-main/src/main/resources/icons/unused/applications-internet.png trunk/lima-main/src/main/resources/icons/unused/balanced.gif trunk/lima-main/src/main/resources/icons/unused/edit.gif trunk/lima-main/src/main/resources/icons/unused/fileChooser.png trunk/lima-main/src/main/resources/icons/unused/filefind.png trunk/lima-main/src/main/resources/icons/unused/filesave.png trunk/lima-main/src/main/resources/icons/unused/folder_green.png trunk/lima-main/src/main/resources/icons/unused/folder_green_open.png trunk/lima-main/src/main/resources/icons/unused/folder_grey.png trunk/lima-main/src/main/resources/icons/unused/folder_grey_open.png trunk/lima-main/src/main/resources/icons/unused/folder_locked.png trunk/lima-main/src/main/resources/icons/unused/folder_open.png trunk/lima-main/src/main/resources/icons/unused/folder_orange.png trunk/lima-main/src/main/resources/icons/unused/folder_orange_open.png trunk/lima-main/src/main/resources/icons/unused/folder_red.png trunk/lima-main/src/main/resources/icons/unused/folder_red_open.png trunk/lima-main/src/main/resources/icons/unused/folder_violet.png trunk/lima-main/src/main/resources/icons/unused/folder_violet_open.png trunk/lima-main/src/main/resources/icons/unused/folder_yellow.png trunk/lima-main/src/main/resources/icons/unused/folder_yellow_open.png trunk/lima-main/src/main/resources/icons/unused/go-home.png trunk/lima-main/src/main/resources/icons/unused/go-jump.png trunk/lima-main/src/main/resources/icons/unused/go-up.png trunk/lima-main/src/main/resources/icons/unused/i18n/ trunk/lima-main/src/main/resources/icons/unused/list-add.png trunk/lima-main/src/main/resources/icons/unused/list-remove.png trunk/lima-main/src/main/resources/icons/unused/locationbar_erase.png trunk/lima-main/src/main/resources/icons/unused/network-idle.png trunk/lima-main/src/main/resources/icons/unused/network-offline.png trunk/lima-main/src/main/resources/icons/unused/network-transmit-receive.png trunk/lima-main/src/main/resources/icons/unused/password.png trunk/lima-main/src/main/resources/icons/unused/reload.png trunk/lima-main/src/main/resources/icons/unused/reload_all_tabs.png trunk/lima-main/src/main/resources/icons/unused/reload_page.png trunk/lima-main/src/main/resources/icons/unused/reset-search.png trunk/lima-main/src/main/resources/icons/unused/revert.png trunk/lima-main/src/main/resources/icons/unused/save.png trunk/lima-main/src/main/resources/icons/unused/save_all.png trunk/lima-main/src/main/resources/icons/unused/search.png trunk/lima-main/src/main/resources/icons/unused/undo.png trunk/lima-main/src/main/resources/icons/unused/unlock.png trunk/lima-main/src/main/resources/icons/unused/validate.gif trunk/lima-main/src/main/resources/icons/unused/view-refresh.png trunk/lima-main/src/main/resources/icons/unused/view-sort-ascending.png Removed: trunk/lima-main/src/main/resources/icons/accessories-text-editor.png trunk/lima-main/src/main/resources/icons/action/advanced-search.png trunk/lima-main/src/main/resources/icons/action/closeTab.png trunk/lima-main/src/main/resources/icons/action/collapseAll.png trunk/lima-main/src/main/resources/icons/action/config.png trunk/lima-main/src/main/resources/icons/action/connect.png trunk/lima-main/src/main/resources/icons/action/connect_creating.png trunk/lima-main/src/main/resources/icons/action/connect_established.png trunk/lima-main/src/main/resources/icons/action/connect_no.png trunk/lima-main/src/main/resources/icons/action/delete.png trunk/lima-main/src/main/resources/icons/action/detail-to-tree.png trunk/lima-main/src/main/resources/icons/action/download-attachment.png trunk/lima-main/src/main/resources/icons/action/download-element.png trunk/lima-main/src/main/resources/icons/action/exit.png trunk/lima-main/src/main/resources/icons/action/expandAll.png trunk/lima-main/src/main/resources/icons/action/go-first.png trunk/lima-main/src/main/resources/icons/action/go-last.png trunk/lima-main/src/main/resources/icons/action/go-next.png trunk/lima-main/src/main/resources/icons/action/go-previous.png trunk/lima-main/src/main/resources/icons/action/groups.png trunk/lima-main/src/main/resources/icons/action/help-faq.png trunk/lima-main/src/main/resources/icons/action/history-next.png trunk/lima-main/src/main/resources/icons/action/history-previous.png trunk/lima-main/src/main/resources/icons/action/history-reset.png trunk/lima-main/src/main/resources/icons/action/import-element.png trunk/lima-main/src/main/resources/icons/action/local.png trunk/lima-main/src/main/resources/icons/action/reload.png trunk/lima-main/src/main/resources/icons/action/remote.png trunk/lima-main/src/main/resources/icons/action/reset-password.png trunk/lima-main/src/main/resources/icons/action/reset-search.png trunk/lima-main/src/main/resources/icons/action/show-tab-detail.png trunk/lima-main/src/main/resources/icons/action/synch.png trunk/lima-main/src/main/resources/icons/action/unconnect.png trunk/lima-main/src/main/resources/icons/action/users.png trunk/lima-main/src/main/resources/icons/applications-internet.png trunk/lima-main/src/main/resources/icons/balanced.gif trunk/lima-main/src/main/resources/icons/closeTab.png trunk/lima-main/src/main/resources/icons/edit.gif trunk/lima-main/src/main/resources/icons/fileChooser.png trunk/lima-main/src/main/resources/icons/filefind.png trunk/lima-main/src/main/resources/icons/filesave.png trunk/lima-main/src/main/resources/icons/folder_green.png trunk/lima-main/src/main/resources/icons/folder_green_open.png trunk/lima-main/src/main/resources/icons/folder_grey.png trunk/lima-main/src/main/resources/icons/folder_grey_open.png trunk/lima-main/src/main/resources/icons/folder_locked.png trunk/lima-main/src/main/resources/icons/folder_open.png trunk/lima-main/src/main/resources/icons/folder_orange.png trunk/lima-main/src/main/resources/icons/folder_orange_open.png trunk/lima-main/src/main/resources/icons/folder_red.png trunk/lima-main/src/main/resources/icons/folder_red_open.png trunk/lima-main/src/main/resources/icons/folder_violet.png trunk/lima-main/src/main/resources/icons/folder_violet_open.png trunk/lima-main/src/main/resources/icons/folder_yellow.png trunk/lima-main/src/main/resources/icons/folder_yellow_open.png trunk/lima-main/src/main/resources/icons/go-home.png trunk/lima-main/src/main/resources/icons/go-jump.png trunk/lima-main/src/main/resources/icons/go-up.png trunk/lima-main/src/main/resources/icons/i18n/ trunk/lima-main/src/main/resources/icons/list-add.png trunk/lima-main/src/main/resources/icons/list-remove.png trunk/lima-main/src/main/resources/icons/locationbar_erase.png trunk/lima-main/src/main/resources/icons/network-idle.png trunk/lima-main/src/main/resources/icons/network-offline.png trunk/lima-main/src/main/resources/icons/network-transmit-receive.png trunk/lima-main/src/main/resources/icons/password.png trunk/lima-main/src/main/resources/icons/reload.png trunk/lima-main/src/main/resources/icons/reload_all_tabs.png trunk/lima-main/src/main/resources/icons/reload_page.png trunk/lima-main/src/main/resources/icons/reset-search.png trunk/lima-main/src/main/resources/icons/revert.png trunk/lima-main/src/main/resources/icons/save.png trunk/lima-main/src/main/resources/icons/save_all.png trunk/lima-main/src/main/resources/icons/search.png trunk/lima-main/src/main/resources/icons/undo.png trunk/lima-main/src/main/resources/icons/unlock.png trunk/lima-main/src/main/resources/icons/unused/action/about.png trunk/lima-main/src/main/resources/icons/unused/action/export-element.png trunk/lima-main/src/main/resources/icons/unused/action/help.png trunk/lima-main/src/main/resources/icons/unused/action/i18n-en.png trunk/lima-main/src/main/resources/icons/unused/action/i18n-fr.png trunk/lima-main/src/main/resources/icons/unused/action/quit.png trunk/lima-main/src/main/resources/icons/unused/action/search.png trunk/lima-main/src/main/resources/icons/unused/action/site.png trunk/lima-main/src/main/resources/icons/unused/action/translate.png trunk/lima-main/src/main/resources/icons/validate.gif trunk/lima-main/src/main/resources/icons/view-refresh.png trunk/lima-main/src/main/resources/icons/view-sort-ascending.png Log: refactor icons Deleted: trunk/lima-main/src/main/resources/icons/accessories-text-editor.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/advanced-search.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/closeTab.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/collapseAll.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/config.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/connect.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/connect_creating.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/connect_established.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/connect_no.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/delete.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/detail-to-tree.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/download-attachment.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/download-element.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/exit.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/expandAll.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/go-first.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/go-last.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/go-next.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/go-previous.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/groups.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/help-faq.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/history-next.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/history-previous.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/history-reset.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/import-element.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/local.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/reload.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/remote.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/reset-password.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/reset-search.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/show-tab-detail.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/synch.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/unconnect.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/action/users.png =================================================================== (Binary files differ) Copied: trunk/lima-main/src/main/resources/icons/action-closeTab.png (from rev 2733, trunk/lima-main/src/main/resources/icons/closeTab.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/action-closeTab.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-main/src/main/resources/icons/applications-internet.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/balanced.gif =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/closeTab.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/edit.gif =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/fileChooser.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/filefind.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/filesave.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_green.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_green_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_grey.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_grey_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_locked.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_orange.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_orange_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_red.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_red_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_violet.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_violet_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_yellow.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/folder_yellow_open.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/go-home.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/go-jump.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/go-up.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/list-add.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/list-remove.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/locationbar_erase.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/network-idle.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/network-offline.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/network-transmit-receive.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/password.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/reload.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/reload_all_tabs.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/reload_page.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/reset-search.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/revert.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/save.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/save_all.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/search.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/undo.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unlock.png =================================================================== (Binary files differ) Copied: trunk/lima-main/src/main/resources/icons/unused/accessories-text-editor.png (from rev 2733, trunk/lima-main/src/main/resources/icons/accessories-text-editor.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/accessories-text-editor.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-main/src/main/resources/icons/unused/action/about.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/export-element.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/help.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/i18n-en.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/i18n-fr.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/quit.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/search.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/site.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/unused/action/translate.png =================================================================== (Binary files differ) Copied: trunk/lima-main/src/main/resources/icons/unused/applications-internet.png (from rev 2733, trunk/lima-main/src/main/resources/icons/applications-internet.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/applications-internet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/balanced.gif (from rev 2733, trunk/lima-main/src/main/resources/icons/balanced.gif) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/balanced.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/edit.gif (from rev 2733, trunk/lima-main/src/main/resources/icons/edit.gif) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/edit.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/fileChooser.png (from rev 2733, trunk/lima-main/src/main/resources/icons/fileChooser.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/fileChooser.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/filefind.png (from rev 2733, trunk/lima-main/src/main/resources/icons/filefind.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/filefind.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/filesave.png (from rev 2733, trunk/lima-main/src/main/resources/icons/filesave.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/filesave.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_green.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_green.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_green.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_green_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_green_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_green_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_grey.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_grey.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_grey.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_grey_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_grey_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_grey_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_locked.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_locked.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_locked.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_orange.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_orange.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_orange.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_orange_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_orange_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_orange_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_red.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_red.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_red.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_red_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_red_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_red_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_violet.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_violet.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_violet.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_violet_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_violet_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_violet_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_yellow.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_yellow.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_yellow.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/folder_yellow_open.png (from rev 2733, trunk/lima-main/src/main/resources/icons/folder_yellow_open.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/folder_yellow_open.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/go-home.png (from rev 2733, trunk/lima-main/src/main/resources/icons/go-home.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/go-home.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/go-jump.png (from rev 2733, trunk/lima-main/src/main/resources/icons/go-jump.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/go-jump.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/go-up.png (from rev 2733, trunk/lima-main/src/main/resources/icons/go-up.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/go-up.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/list-add.png (from rev 2733, trunk/lima-main/src/main/resources/icons/list-add.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/list-add.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/list-remove.png (from rev 2733, trunk/lima-main/src/main/resources/icons/list-remove.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/list-remove.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/locationbar_erase.png (from rev 2733, trunk/lima-main/src/main/resources/icons/locationbar_erase.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/locationbar_erase.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/network-idle.png (from rev 2733, trunk/lima-main/src/main/resources/icons/network-idle.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/network-idle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/network-offline.png (from rev 2733, trunk/lima-main/src/main/resources/icons/network-offline.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/network-offline.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/network-transmit-receive.png (from rev 2733, trunk/lima-main/src/main/resources/icons/network-transmit-receive.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/network-transmit-receive.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/password.png (from rev 2733, trunk/lima-main/src/main/resources/icons/password.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/password.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/reload.png (from rev 2733, trunk/lima-main/src/main/resources/icons/reload.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/reload.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/reload_all_tabs.png (from rev 2733, trunk/lima-main/src/main/resources/icons/reload_all_tabs.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/reload_all_tabs.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/reload_page.png (from rev 2733, trunk/lima-main/src/main/resources/icons/reload_page.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/reload_page.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/reset-search.png (from rev 2733, trunk/lima-main/src/main/resources/icons/reset-search.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/reset-search.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/revert.png (from rev 2733, trunk/lima-main/src/main/resources/icons/revert.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/revert.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/save.png (from rev 2733, trunk/lima-main/src/main/resources/icons/save.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/save.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/save_all.png (from rev 2733, trunk/lima-main/src/main/resources/icons/save_all.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/save_all.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/search.png (from rev 2733, trunk/lima-main/src/main/resources/icons/search.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/search.png ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/undo.png (from rev 2733, trunk/lima-main/src/main/resources/icons/undo.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/undo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/unlock.png (from rev 2733, trunk/lima-main/src/main/resources/icons/unlock.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/unlock.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/validate.gif (from rev 2733, trunk/lima-main/src/main/resources/icons/validate.gif) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/validate.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/view-refresh.png (from rev 2733, trunk/lima-main/src/main/resources/icons/view-refresh.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/view-refresh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/lima-main/src/main/resources/icons/unused/view-sort-ascending.png (from rev 2733, trunk/lima-main/src/main/resources/icons/view-sort-ascending.png) =================================================================== (Binary files differ) Property changes on: trunk/lima-main/src/main/resources/icons/unused/view-sort-ascending.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-main/src/main/resources/icons/validate.gif =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/view-refresh.png =================================================================== (Binary files differ) Deleted: trunk/lima-main/src/main/resources/icons/view-sort-ascending.png =================================================================== (Binary files differ)

1 0

r2739 - in trunk/lima-main/src/main/resources: . i18n
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:19:13 +0100 (Sun, 08 Nov 2009) New Revision: 2739 Removed: trunk/lima-main/src/main/resources/commandline.properties Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties Log: use JAXX-2.0 clean poms Deleted: trunk/lima-main/src/main/resources/commandline.properties =================================================================== --- trunk/lima-main/src/main/resources/commandline.properties 2009-11-08 14:18:56 UTC (rev 2738) +++ trunk/lima-main/src/main/resources/commandline.properties 2009-11-08 14:19:13 UTC (rev 2739) @@ -1,55 +0,0 @@ -############################################################################### -### Option definitions ######################################################## -############################################################################### - -# TODO define them - - -############################################################################### -### Main configuration definition ############################################# -############################################################################### - -### -### Application global properties -### - -main.config.definition.debugMode=java.lang.Boolean:false -main.config.modifiers.debugMode=mandatory - -#main.config.definition.siteURL=java.net.URL:http://lima.labs.libre-entreprise.org -#main.config.modifiers.siteURL=final,static,mandatory - -### -### user properties -### - -main.config.definition.userFirstName=java.lang.String -main.config.modifiers.userFirstName=mandatory - -main.config.definition.userLastName=java.lang.String -main.config.modifiers.userLastName=mandatory - -main.config.definition.userMail=java.lang.String -main.config.modifiers.userMail=mandatory - -############################################################################### -### Remote configuration definition ########################################### -############################################################################### - -remote.config.definition.login=java.lang.String -remote.config.modifiers.login=mandatory - -remote.config.definition.password=java.lang.String -remote.config.modifiers.password= - -remote.config.definition.URI=java.net.URI:jnp://localhost:1099 -remote.config.modifiers.URI=static,mandatory - -remote.config.definition.useProxy=java.lang.Boolean:False -remote.config.modifiers.useProxy= - -remote.config.definition.proxyLogin=java.lang.String -remote.config.modifiers.proxyLogin= - -remote.config.definition.proxyPassword=java.lang.String -remote.config.modifiers.proxyPassword= Modified: trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties =================================================================== --- trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-08 14:18:56 UTC (rev 2738) +++ trunk/lima-main/src/main/resources/i18n/lima-main-fr_FR.properties 2009-11-08 14:19:13 UTC (rev 2739) @@ -118,7 +118,7 @@ lima.loading=Chargement lima.menu.file=Fichier lima.menu.help=Aide -lima.menu.help.about=Afficher l'A Propos +lima.menu.help.about=A Propos lima.menu.help.help=Afficher l'aide lima.menu.help.i18n=Langue lima.menu.help.i18n.fr=Fran\u00E7ais

1 0

r2738 - in trunk/lima-main: . src/main/java/org/chorem/lima src/main/java/org/chorem/lima/export src/main/java/org/chorem/lima/ui
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:18:56 +0100 (Sun, 08 Nov 2009) New Revision: 2738 Modified: trunk/lima-main/pom.xml trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java trunk/lima-main/src/main/java/org/chorem/lima/Main.java trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx Log: use JAXX-2.0 clean poms Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/pom.xml 2009-11-08 14:18:56 UTC (rev 2738) @@ -47,7 +47,7 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> + <artifactId>jaxx-runtime</artifactId> <exclusions> <exclusion> <groupId>javax.help</groupId> @@ -58,10 +58,10 @@ <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> + <artifactId>jaxx-widgets</artifactId> </dependency> - <dependency> +   <dependency> @@ -91,8 +91,6 @@ <dependency> <groupId>jdom</groupId> <artifactId>jdom</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> </dependencies> @@ -243,19 +241,19 @@ </configuration> </plugin> -  <jnlpExtension> <name>jxlayer</name> <title>Swing labs JXLayer</title> @@ -266,7 +264,7 @@ </jnlpExtension> </jnlpExtensions> </configuration> - </plugin--> + </plugin> <plugin> <groupId>org.nuiton</groupId> Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaAction.java 2009-11-08 14:18:56 UTC (rev 2738) @@ -4,20 +4,15 @@ import org.apache.commons.logging.LogFactory; /** + * Les actions appellables via {@link Main}. * - * Les actions appellables via {@link ObserveMain}. - * - * Consulter la classe {@link fr.ird.observe.ObserveConfig.Action} pour - * connaitre les actions possibles. - * * @author tony - * @see ObserveConfig - * @see ObserveMain */ -(a)jaxx.runtime.DefaultApplicationContext.AutoLoad public class LimaAction { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ static private Log log = LogFactory.getLog(LimaAction.class); /** * La configuration de l'application. Modified: trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/LimaContext.java 2009-11-08 14:18:56 UTC (rev 2738) @@ -32,7 +32,8 @@ */ package org.chorem.lima; -import jaxx.runtime.JAXXContextEntryDef; +import jaxx.runtime.Util; +import jaxx.runtime.context.JAXXContextEntryDef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.dto.util.DTOHelper; @@ -47,7 +48,7 @@ /** * @author chemit */ -public class LimaContext extends jaxx.runtime.DefaultApplicationContext { +public class LimaContext extends jaxx.runtime.context.DefaultApplicationContext { /** * to use log facility, just put in your code: log.info(\"...\"); @@ -58,7 +59,7 @@ * {@link #init()} */ protected static LimaContext instance; - public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = JAXXContextEntryDef.newDef("mainUI", MainView.class); + public static JAXXContextEntryDef<MainView> MAIN_UI_ENTRY_DEF = Util.newContextEntryDef("mainUI", MainView.class); /** * @return <code>true</code> si le context a été initialisé via la méthode Modified: trunk/lima-main/src/main/java/org/chorem/lima/Main.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/Main.java 2009-11-08 14:18:56 UTC (rev 2738) @@ -193,7 +193,7 @@ b.getProgressBar().setString("70% : " + _("lima.progressBar.load.etape5")); b.getProgressBar().setValue(70); dataManager.getTransactionModel(b.getProgressBar()); - b.getProgressBarFrame().dispose(); + b.dispose(); } }.start(); Modified: trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/export/XMLExport.java 2009-11-08 14:18:56 UTC (rev 2738) @@ -70,7 +70,7 @@ /** * Cete méthode permet d'exporter des données de Callao vers un fichier au * format xml. - * @param namefile + * @param pathFile * @return */ public String exportFile(String pathFile) @@ -153,7 +153,7 @@ progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7")); progressBar.getProgressBar().setValue(100); enregistre(file); - progressBar.getProgressBarFrame().dispose(); + progressBar.dispose(); } }.start(); @@ -213,7 +213,7 @@ progressBar.getProgressBar().setString("100% : "+_("lima.progressBar.export.etape7")); progressBar.getProgressBar().setValue(100); enregistre(file); - progressBar.getProgressBarFrame().dispose(); + progressBar.dispose(); } }.start(); return ServiceHelper.RESPOND_SUCCESS; Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/AccountForm.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -1,5 +1,5 @@ <JFrame locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close"> - <style source="css/lima.css" /> + <style source="css/lima.css"/> <Table insets='5,5,5,5'> <row> <cell> @@ -22,13 +22,13 @@ <JLabel text="lima.account.type"/> </cell> <cell> - <JComboBox id="typeComboBox"> + <JAXXComboBox id="typeComboBox"> <item value='{null}' label=' ' selected="true"/> <item value='{_("lima.actif")}'/> <item value='{_("lima.passif")}'/> <item value='{_("lima.produit")}'/> <item value='{_("lima.charge")}'/> - </JComboBox> + </JAXXComboBox> </cell> </row> <row> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/BilanViewImpl.java 2009-11-08 14:18:56 UTC (rev 2738) @@ -439,7 +439,7 @@ progressBar.getProgressBar().setValue(95); modelBilanPassif.fireTableDataChanged(); progressBar.getProgressBar().setValue(100); - progressBar.getProgressBarFrame().dispose(); + progressBar.dispose(); } }.start(); Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/CriteriaWidget.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -1,10 +1,10 @@ <Table insets='5,5,5,5'> <script> - protected void removeCriteriaWidget() {}; + protected void removeCriteriaWidget(){} </script> <row> <cell> - <JComboBox id="criteriaComboBox" width="200"> + <JAXXComboBox id="criteriaComboBox" width="200"> <item value='date' label='{_("lima.date")}' selected="true"/> <item value='voucher' label='{_("lima.voucher")}'/> <item value='account' label='{_("lima.account")}'/> @@ -12,7 +12,7 @@ <item value='debit' label='{_("lima.debit")}'/> <item value='credit' label='{_("lima.credit")}'/> <item value='amount' label='{_("lima.amount")}'/> - </JComboBox> + </JAXXComboBox> </cell> <cell weightx="0"> <JPanel id="criteriaPanel"/> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/FileChooseView.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -1,6 +1,4 @@ <JFrame title="lima.export"> - <style source="css/lima.css" /> - <JFileChooser id="chooser" width="620" height="400"> - </JFileChooser> - + <style source="css/lima.css"/> + <JFileChooser id="chooser" width="620" height="400"/> </JFrame> \ No newline at end of file Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/MyTabHeader.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -13,7 +13,7 @@ focusPainted='false' enabled='true' horizontalTextPosition='0' - icon='{createImageIcon("closeTab.png")}' + actionIcon='closeTab' /> </cell> </row> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ProgressBar.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -1,9 +1,8 @@ <JDialog title="lima.loading" width="620" height="70" -id="progressBarFrame" -iconImage='{Toolkit.getDefaultToolkit().getImage(getClass().getResource("/icons/lima.png"))}' -> + id="progressBarFrame" + iconImage='{Toolkit.getDefaultToolkit().getImage(getClass().getResource("/icons/lima.png"))}'> <script> progressBarFrame.setLocationRelativeTo(null); </script> - <JProgressBar foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar" /> + <JProgressBar foreground='{new Color(4, 0, 0)}' value='0' maximum='100' id="progressBar"/> </JDialog> \ No newline at end of file Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ReportsView.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -5,11 +5,11 @@ <JLabel text="lima.reports"/> </cell> <cell> - <JComboBox> + <JAXXComboBox> <item value='{_("lima.balance")}'/> <item value='{_("lima.journal")}'/> <item value='{_("lima.grand.livre")}'/> - </JComboBox> + </JAXXComboBox> </cell> </row> <row> @@ -22,10 +22,10 @@ <JLabel text="lima.period"/> </cell> <cell> - <JComboBox> + <JAXXComboBox> <item value='{null}' label=' '/> <item value='Exercice 08'/> - </JComboBox> + </JAXXComboBox> </cell> </row> <row> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx 2009-11-08 14:17:50 UTC (rev 2737) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/SearchTransactionView.jaxx 2009-11-08 14:18:56 UTC (rev 2738) @@ -17,10 +17,10 @@ <JLabel text="lima.search.items.where" width="200"/> </cell> <cell> - <JComboBox id="criteriaAllAnyComboBox" width="200"> + <JAXXComboBox id="criteriaAllAnyComboBox" width="200"> <item value='all' label='{_("lima.all.criteria")}' selected="true"/> <item value='any' label='{_("lima.any.criteria")}'/> - </JComboBox> + </JAXXComboBox> </cell> </row> <row>

1 0

r2737 - trunk
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 15:17:50 +0100 (Sun, 08 Nov 2009) New Revision: 2737 Modified: trunk/pom.xml Log: use JAXX-2.0 clean poms Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-08 13:48:14 UTC (rev 2736) +++ trunk/pom.xml 2009-11-08 14:17:50 UTC (rev 2737) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -49,7 +50,6 @@ <scope>compile</scope> </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> @@ -63,33 +63,19 @@ <scope>compile</scope> </dependency> -  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-widgets</artifactId> - <version>1.0.0-rc-2</version> - <scope>compile</scope> - </dependency> -  <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> + <artifactId>jaxx-runtime</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-swing-action</artifactId> + <artifactId>jaxx-widgets</artifactId> <version>${jaxx.version}</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime-swing-widget</artifactId> - <version>${jaxx.version}</version> - <scope>compile</scope> - </dependency>  <dependency> @@ -123,6 +109,14 @@ <artifactId>dom4j</artifactId> <version>1.6.1</version> </dependency> + + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> + <scope>compile</scope> + </dependency> +  <i18n.version>1.0.1</i18n.version>

1 0

r2736 - trunk/lima-service-mock
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 14:48:14 +0100 (Sun, 08 Nov 2009) New Revision: 2736 Modified: trunk/lima-service-mock/pom.xml Log: fix transitive dependency... Modified: trunk/lima-service-mock/pom.xml =================================================================== --- trunk/lima-service-mock/pom.xml 2009-11-08 13:09:30 UTC (rev 2735) +++ trunk/lima-service-mock/pom.xml 2009-11-08 13:48:14 UTC (rev 2736) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion>  @@ -20,6 +21,12 @@ <artifactId>lima-service</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + </dependencies>

1 0

r2735 - trunk/lima-dto
by tchemit＠users.chorem.org 08 Nov '09

08 Nov '09

Author: tchemit Date: 2009-11-08 14:09:30 +0100 (Sun, 08 Nov 2009) New Revision: 2735 Modified: trunk/lima-dto/pom.xml Log: remove topia-persistence dependency Modified: trunk/lima-dto/pom.xml =================================================================== --- trunk/lima-dto/pom.xml 2009-11-08 12:04:50 UTC (rev 2734) +++ trunk/lima-dto/pom.xml 2009-11-08 13:09:30 UTC (rev 2735) @@ -28,10 +28,10 @@ <artifactId>commons-lang</artifactId> </dependency> - <dependency> +  </dependencies> @@ -61,12 +61,8 @@ <phase>process-sources</phase>  <configuration> - <srcDirZuml>${maven.src.dir}/main/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.DTOGenerator</templates> - <destDirGen>${maven.gen.dir}/java</destDirGen> + <templates>org.nuiton.topia.generator.DTOGenerator</templates> <fullPackagePath>org.chorem.lima</fullPackagePath> <extractedPackages>org.chorem.lima</extractedPackages> </configuration>

1 0