Author: dcosse Date: 2014-07-24 14:04:19 +0200 (Thu, 24 Jul 2014) New Revision: 3862 Url: http://forge.chorem.org/projects/lima/repository/revisions/3862 Log: Utilisation De DesctopUtils de nuiton-utils ?\195?\160 la place de Desktop Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -45,18 +45,18 @@ <JToolBar floatable="false"> <JButton id="addButton" - toolTipText="{ "lima.ui.account.addaccount" + " (Ctrl+N)"}" + toolTipText="{ t("lima.ui.account.addaccount") + " (Ctrl+N)"}" actionIcon='account-new' onActionPerformed="handler.addAccount()"/> <JButton id="updateButton" - toolTipText="{ "lima.ui.common.update" + " (Ctrl+M)"}" + toolTipText="{ t("lima.ui.common.update") + " (Ctrl+M)"}" actionIcon='account-edit' onActionPerformed="handler.updateAccount()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ "lima.ui.common.remove" + " (Del)"}" + toolTipText="{ t("lima.ui.common.remove") + " (Del)"}" actionIcon='account-remove' onActionPerformed="handler.removeAccount()" enabled="{isSelectedRow()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -45,18 +45,18 @@ <JToolBar floatable="false"> <JButton id="addButton" - toolTipText="{ "lima.ui.entrybook.add" + " (Ctrl+N)"}" + toolTipText="{ t("lima.ui.entrybook.add") + " (Ctrl+N)"}" actionIcon='entryBook-new' onActionPerformed="handler.addEntryBook()"/> <JButton id="updateButton" - toolTipText="{ "lima.ui.entrybook.update" + " (Ctrl+M)"}" + toolTipText="{ t("lima.ui.entrybook.update") + " (Ctrl+M)"}" actionIcon='entryBook-edit' onActionPerformed="handler.updateEntryBook()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ "lima.ui.entrybook.remove" + " (Del)"}" + toolTipText="{ t("lima.ui.entrybook.remove") + " (Del)"}" actionIcon='entryBook-remove' onActionPerformed="handler.deleteEntryBook()" enabled="{isSelectedRow()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -46,7 +46,7 @@ <JToolBar floatable="false"> <JButton id="blockButton" - toolTipText="{ "lima.ui.financialperiod.block" + " (Ctrl+C)"}" + toolTipText="{ t("lima.ui.financialperiod.block") + " (Ctrl+C)"}" actionIcon='financialPeriod-close' onActionPerformed="handler.blockFinancialPeriod()" enabled="{isSelectedPeriod()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -28,6 +28,7 @@ <import> javax.swing.ListSelectionModel org.jdesktop.swingx.decorator.HighlighterFactory + static org.nuiton.i18n.I18n.t </import> <FinancialStatementChartViewHandler id="handler" @@ -39,37 +40,37 @@ <JToolBar floatable="false"> <JButton id="addFinancialStatementHeader" - toolTipText="{ "lima.financialstatement.header.add" + " (Ctrl+Maj+N)"}" + toolTipText="{ t("lima.financialstatement.header.add") + " (Ctrl+Maj+N)"}" actionIcon='financialstatement-add-header' onActionPerformed="handler.addFinancialStatementHeader()"/> <JButton id="addFinancialStatementMovement" - toolTipText="{ "lima.financialstatement.movement.add" + " (Ctrl+N)"}" + toolTipText="{ t("lima.financialstatement.movement.add") + " (Ctrl+N)"}" actionIcon='financialstatement-add-movement' onActionPerformed="handler.addFinancialStatementMovement()" enabled="{isSelectedRow()}"/> <JButton id="updateButton" - toolTipText="{ "lima.common.update" + " (Ctrl+M)"}" + toolTipText="{ t("lima.common.update") + " (Ctrl+M)"}" actionIcon='financialstatement-edit' onActionPerformed="handler.updateFinancialStatement()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ "lima.common.remove" + " (Del)"}" + toolTipText="{ t("lima.common.remove") + " (Del)"}" actionIcon='financialstatement-remove' onActionPerformed="handler.removeFinancialStatement()" enabled="{isSelectedRow()}"/> <JButton id="importButton" - toolTipText="{ "lima.ui.importexport.import" + " (Ctrl+I)"}" + toolTipText="{ t("lima.ui.importexport.import") + " (Ctrl+I)"}" actionIcon='financialstatement-import' onActionPerformed="handler.importFinancialStatementChart()"/> <JToolBar.Separator/> <JButton id="checkButton" - toolTipText="{ "lima.financialstatement.check" + " (Ctrl+F)"}" + toolTipText="{ t("lima.financialstatement.check") + " (Ctrl+F)"}" actionIcon='financialstatement-check' onActionPerformed="handler.financialStatementChartCheck()"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -61,39 +61,39 @@ <row> <cell fill="horizontal"> <JToolBar floatable="false"> - <JButton toolTipText="{ "lima.entries.addTransaction" + " (Ctrl+Shift+N)"}" + <JButton toolTipText="{ t("lima.entries.addTransaction") + " (Ctrl+Shift+N)"}" actionIcon='add-financial-transaction' onActionPerformed="handler.addFinancialTransaction()" /> - <JButton toolTipText="{ "lima.entries.remove.transaction" + " (Ctrl+Shift+Del)"}" + <JButton toolTipText="{ t("lima.entries.remove.transaction") + " (Ctrl+Shift+Del)"}" actionIcon='delete-financial-transaction' enabled="{isSelectedRow()}" onActionPerformed="handler.deleteSelectedTransaction()" /> - <JButton toolTipText="{ "lima.entries.copy.transaction" + " (Ctrl+Shift+C)"}" actionIcon='copy' + <JButton toolTipText="{ t("lima.entries.copy.transaction") + " (Ctrl+Shift+C)"}" actionIcon='copy' enabled="{isSelectedRow()}" onActionPerformed="handler.copyTransaction()" /> - <JButton toolTipText="{ "lima.entries.paste.transaction" + " (Ctrl+Shift+V)"}" actionIcon='paste' + <JButton toolTipText="{ t("lima.entries.paste.transaction") + " (Ctrl+Shift+V)"}" actionIcon='paste' enabled="{isTransactionInClipBoard()}" onActionPerformed="handler.pasteTransaction()" /> <JToolBar.Separator/> - <JButton toolTipText ="{ "lima.entries.addEntry" + " (Ctrl+N)"}" actionIcon='add-entry' + <JButton toolTipText ="{ t("lima.entries.addEntry") + " (Ctrl+N)"}" actionIcon='add-entry' enabled="{isSelectedRow()}" onActionPerformed="handler.addEntry()" /> - <JButton toolTipText="{ "lima.entries.remove.entry" + " (Ctrl+Del)"}" actionIcon='delete-entry' + <JButton toolTipText="{ t("lima.entries.remove.entry") + " (Ctrl+Del)"}" actionIcon='delete-entry' enabled="{isSelectedRow()}" onActionPerformed="handler.deleteSelectedEntry()" /> - <JButton toolTipText="{ "lima.entries.copy.entry" + " (Ctrl+Alt+C)"}" actionIcon='copy' + <JButton toolTipText="{ t("lima.entries.copy.entry") + " (Ctrl+Alt+C)"}" actionIcon='copy' enabled="{isSelectedRow()}" onActionPerformed="handler.copyEntry()" /> - <JButton toolTipText="{ "lima.entries.paste.entry" + " (Ctrl+Alt+V)"}" actionIcon='paste' + <JButton toolTipText="{ t("lima.entries.paste.entry") + " (Ctrl+Alt+V)"}" actionIcon='paste' enabled="{isEntryInClipBoard() && isSelectedRow()}" onActionPerformed="handler.pasteEntry()" /> - <JButton toolTipText="{ "lima.entries.assign.entries" + " (Ctrl+Alt+A)"}" actionIcon='assign-all-entries-in-transaction' + <JButton toolTipText="{ t("lima.entries.assign.entries") + " (Ctrl+Alt+A)"}" actionIcon='assign-all-entries-in-transaction' enabled="{isAssignableInAllEntries() && isSelectedRow()}" onActionPerformed="handler.assignAllEntries()" /> <JToolBar.Separator/> - <JButton toolTipText="{ "lima.entries.balance" + " (Ctrl+B)"}" actionIcon='balance' + <JButton toolTipText="{ t("lima.entries.balance") + " (Ctrl+B)"}" actionIcon='balance' enabled="{!isBalance()}" onActionPerformed="handler.balanceTransaction()" /> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -53,18 +53,18 @@ <row> <cell fill="horizontal"> <JToolBar floatable="false"> - <JButton toolTipText="{ "lima.entries.remove.transaction" + " (Ctrl+Shift+Del)"}" + <JButton toolTipText="{ t("lima.entries.remove.transaction") + " (Ctrl+Shift+Del)"}" actionIcon='delete-financial-transaction' enabled="{isSelectedRow()}" onActionPerformed="getHandler().deleteSelectedTransaction()" /> - <JButton toolTipText ="{ "lima.entries.addEntry" + " (Ctrl+N)"}" actionIcon='add-entry' + <JButton toolTipText ="{ t("lima.entries.addEntry") + " (Ctrl+N)"}" actionIcon='add-entry' enabled="{isSelectedRow()}" onActionPerformed="getHandler().addEntry()" /> - <JButton toolTipText="{ "lima.entries.remove.entry" + " (Ctrl+Del)"}" actionIcon='delete-entry' + <JButton toolTipText="{ t("lima.entries.remove.entry") + " (Ctrl+Del)"}" actionIcon='delete-entry' enabled="{isSelectedRow()}" onActionPerformed="getHandler().deleteSelectedEntry()" /> <JToolBar.Separator/> - <JButton toolTipText="{ "lima.entries.balance" + " (Ctrl+B)"}" actionIcon='balance' + <JButton toolTipText="{ t("lima.entries.balance") + " (Ctrl+B)"}" actionIcon='balance' enabled="{!isBalance()}" onActionPerformed="handler.balanceTransaction()" /> <JToolBar.Separator/> @@ -79,7 +79,7 @@ getHandler().refresh()" editable="false"/> <JToolBar.Separator/> - <JButton toolTipText="{ "lima.ui.common.refresh" + " (F5)"}" actionIcon='refresh' + <JButton toolTipText="{ t("lima.ui.common.refresh") + " (F5)"}" actionIcon='refresh' onActionPerformed="getHandler().refresh()"/> </JToolBar> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -28,6 +28,7 @@ <import> javax.swing.ListSelectionModel javax.swing.DefaultListSelectionModel + static org.nuiton.i18n.I18n.t </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> @@ -46,24 +47,24 @@ <JToolBar floatable="false"> <JButton id="addButton" - toolTipText="{ "lima.charts.fiscalperiod.add" + " (Ctrl+N)"}" + toolTipText="{ t("lima.charts.fiscalperiod.add") + " (Ctrl+N)"}" actionIcon='fiscalPeriod-new' onActionPerformed="handler.addFiscalPeriod()"/> <JButton id="updateButton" - toolTipText="{ "lima.charts.fiscalperiod.update" + " (Ctrl+M)"}" + toolTipText="{ t("lima.charts.fiscalperiod.update") + " (Ctrl+M)"}" actionIcon='fiscalPeriod-edit' onActionPerformed="handler.updateFiscalPeriod()" enabled="{isDeleteEnabled()}" /> <JButton id="blockButton" - toolTipText="{ "lima.charts.fiscalperiod.block" + " (Ctrl+B)"}" + toolTipText="{ t("lima.charts.fiscalperiod.block") + " (Ctrl+B)"}" actionIcon='fiscalPeriod-close' onActionPerformed="handler.blockFiscalPeriod()" enabled="{isBlockEnabled()}"/> <JButton id="deleteButton" - toolTipText="{ "lima.charts.fiscalperiod.delete" + " (Del)"}" + toolTipText="{ t("lima.charts.fiscalperiod.delete") + " (Del)"}" actionIcon='fiscalPeriod-remove' onActionPerformed="handler.deleteFiscalPeriod()" enabled="{isDeleteEnabled()}"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/HomeView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -29,6 +29,7 @@ javax.swing.BoxLayout javax.swing.border.EtchedBorder jaxx.runtime.SwingUtil + static org.nuiton.i18n.I18n.t </import> <Dimension id="fixedSize" javaBean='new Dimension(500,200)'/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -32,6 +32,7 @@ org.chorem.lima.entity.Account javax.swing.ListSelectionModel org.jdesktop.swingx.JXDatePicker + static org.nuiton.i18n.I18n.t </import> <LetteringViewHandler id="handler" constructorParams="this"/> @@ -54,19 +55,19 @@ <JToolBar floatable="false"> <JButton id="lettered" - toolTipText="{ "lima.ui.lettering.buttonLettered" + " (Ctrl+L)"}" + toolTipText="{ t("lima.ui.lettering.buttonLettered") + " (Ctrl+L)"}" enabled="{editModel.isLettred()}" actionIcon='lettering' onActionPerformed="handler.addLetter()"/> <JButton id="noLettered" - toolTipText="{ "lima.ui.lettering.buttonNoLettered" + " (Del)"}" + toolTipText="{ t("lima.ui.lettering.buttonNoLettered") + " (Del)"}" enabled="{editModel.isUnLettred()}" actionIcon='un-lettering' onActionPerformed="handler.removeLetter()"/> <JButton id="round" - toolTipText="{ "lima.ui.lettering.buttonEqualize" + " (Ctrl+B)"}" + toolTipText="{ t("lima.ui.lettering.buttonEqualize") + " (Ctrl+B)"}" enabled="{editModel.isEqualized()}" actionIcon='balance' onActionPerformed="handler.roundAndCreateEntry()"/> @@ -113,7 +114,7 @@ <JToolBar.Separator/> <JButton id="refresh" - toolTipText="{ "lima.ui.lettering.buttonRefresh" + " (F5)"}" + toolTipText="{ t("lima.ui.lettering.buttonRefresh") + " (F5)"}" actionIcon='refresh' onActionPerformed="handler.updateAllEntries()"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-07-23 16:36:19 UTC (rev 3861) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-07-24 12:04:19 UTC (rev 3862) @@ -42,18 +42,18 @@ <JToolBar floatable="false"> <JButton id="addVatStatementMovement" - toolTipText="{ "lima.vatstatement.movement.add" + " (Ctrl+N)"}" + toolTipText="{ t("lima.vatstatement.movement.add") + " (Ctrl+N)"}" actionIcon='vatstatement-new' onActionPerformed="handler.addVatStatementMovement()"/> <JButton id="updateButton" - toolTipText="{ "lima.common.update" + " (Ctrl+M)"}" + toolTipText="{ t("lima.common.update") + " (Ctrl+M)"}" actionIcon='vatstatement-edit' onActionPerformed="handler.updateVatStatement()" enabled="{isSelectedRow()}"/> <JButton id="removeButton" - toolTipText="{ "lima.common.remove" + " (Del)"}" + toolTipText="{ t("lima.common.remove") + " (Del)"}" actionIcon='vatstatement-remove' onActionPerformed="handler.removeVatStatement()" enabled="{isSelectedRow()}"/>