This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit df45d8e2078dcb712ae7432052c40040022aac18 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 12 21:13:08 2016 +0200 Introduce a new module jaxx-widget-about + make possible to add as many as wanted tags from resources (Fixes #4024) --- jaxx-widgets-about/LICENSE.txt | 165 +++++++++++++++++++++ jaxx-widgets-about/README.md | 2 + jaxx-widgets-about/changelog.txt | 5 + jaxx-widgets-about/pom.xml | 143 ++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 20 +++ .../org/nuiton/jaxx/widgets/about/AboutPanel.jaxx | 110 ++++++++++++++ .../jaxx/widgets/about}/AboutPanelHandler.java | 61 ++++---- .../i18n/jaxx-widgets-about_en_GB.properties | 4 + .../i18n/jaxx-widgets-about_es_ES.properties | 4 + .../i18n/jaxx-widgets-about_fr_FR.properties | 4 + jaxx-widgets-about/src/site/site.xml | 46 ++++++ .../java/jaxx/runtime/swing/AboutPanelHandler.java | 2 + .../resources/i18n/jaxx-widgets_en_GB.properties | 43 ------ .../resources/i18n/jaxx-widgets_es_ES.properties | 43 ------ .../resources/i18n/jaxx-widgets_fr_FR.properties | 43 ------ pom.xml | 1 + 16 files changed, 538 insertions(+), 158 deletions(-) diff --git a/jaxx-widgets-about/LICENSE.txt b/jaxx-widgets-about/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/jaxx-widgets-about/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/jaxx-widgets-about/README.md b/jaxx-widgets-about/README.md new file mode 100644 index 0000000..d2e50d3 --- /dev/null +++ b/jaxx-widgets-about/README.md @@ -0,0 +1,2 @@ +To deploy new version of pom: mvn deploy +To install localy: mvn install diff --git a/jaxx-widgets-about/changelog.txt b/jaxx-widgets-about/changelog.txt new file mode 100644 index 0000000..1e285bd --- /dev/null +++ b/jaxx-widgets-about/changelog.txt @@ -0,0 +1,5 @@ +1.6.0 + * introduce StatusMessageBar and AboutPanel (fork from nuiton-widgets but in JAXX :)) + +1.5 + * 20090404 [chemit] - initial version diff --git a/jaxx-widgets-about/pom.xml b/jaxx-widgets-about/pom.xml new file mode 100644 index 0000000..6a9659b --- /dev/null +++ b/jaxx-widgets-about/pom.xml @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JAXX :: Widgets + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.32-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-about</artifactId> + + <name>JAXX :: Widgets About</name> + <description>About panel by JAXX</description> + + + <properties> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + <jaxx.autoImportCss>true</jaxx.autoImportCss> + <jaxx.addAutoHandlerUI>true</jaxx.addAutoHandlerUI> + <!--jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon--> + </properties> + + <dependencies> + + <!-- sibiling dependencies --> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + + <plugins> + + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> diff --git a/jaxx-widgets-about/src/license/THIRD-PARTY.properties b/jaxx-widgets-about/src/license/THIRD-PARTY.properties new file mode 100644 index 0000000..81b2769 --- /dev/null +++ b/jaxx-widgets-about/src/license/THIRD-PARTY.properties @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU General Public License - Version 2 with the class path exception +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Aug 18 07:10:57 CEST 2011 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 diff --git a/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanel.jaxx b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanel.jaxx new file mode 100644 index 0000000..84f1f06 --- /dev/null +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanel.jaxx @@ -0,0 +1,110 @@ +<!-- + #%L + JAXX :: Widgets + %% + Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<Table insets='1' background='{getBackgroundColor()}' border='{BorderFactory.createLineBorder(Color.BLACK, 1)}'> + + <import> + java.awt.Color + java.awt.Frame + javax.swing.BorderFactory + javax.swing.SwingConstants + </import> + + <AboutPanelHandler id='handler' constructorParams='this'/> + + <String id='title' javaBean='null'/> + + <String id='iconPath' javaBean='null'/> + + <String id='aboutText' javaBean='null'/> + + <String id='bottomText' javaBean='null'/> + + <Color id='backgroundColor' javaBean='null'/> + + <script><![CDATA[ +public void setLicenseFile(String filename) { + handler.setLicenseFile(filename); +} + +public void setThirdpartyFile(String filename) { + handler.setThirdpartyFile(filename); +} + +public void addTab(String tabTitle, String resourceName) { + handler.addTab(tabTitle, resourceName); +} +public void buildTopPanel() { + handler.buildTopPanel(); +} + +public void init() { + handler.init(); +} + +public void showInDialog(Frame ui, boolean undecorated) { + handler.showInDialog(ui, undecorated); +} + +void $afterCompleteSetup() { + handler.$afterCompleteSetup(); +} + +]]> + </script> + <row> + <cell weightx='1' fill='both'> + <JPanel background='{Color.WHITE}' layout='{new BorderLayout()}'> + <JLabel text='{SwingUtil.getStringValue(getTitle())}' visible='{getTitle() != null}' font-size='12' + constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> + <row> + <cell weightx='1' fill='both'> + <JPanel id='topPanel'/> + </cell> + </row> + <row> + <cell weighty='1' fill='both'> + <JTabbedPane id='tabs'> + <tab title="aboutframe.about"> + <JScrollPane id='aboutContent' border='{null}'> + <JEditorPane contentType='text/html' editable='false' border='{null}' + text='{SwingUtil.getStringValue(getAboutText())}' + onHyperlinkUpdate='SwingUtil.openLink(event)'/> + </JScrollPane> + </tab> + </JTabbedPane> + </cell> + </row> + <row> + <cell fill='both'> + <JPanel layout='{new BorderLayout()}'> + <JLabel id='bottomLabel' constraints='BorderLayout.CENTER' horizontalAlignment='{SwingConstants.CENTER}' + text='{SwingUtil.getStringValue(getBottomText())}' visible='{getBottomText() != null}'/> + <JButton id='close' action='{handler.closeAction}' constraints='BorderLayout.EAST'/> + </JPanel> + </cell> + </row> + +</Table> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanelHandler.java similarity index 82% copy from jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java copy to jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanelHandler.java index 2626d81..cc42b3a 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java +++ b/jaxx-widgets-about/src/main/java/org/nuiton/jaxx/widgets/about/AboutPanelHandler.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package jaxx.runtime.swing; +package org.nuiton.jaxx.widgets.about; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; @@ -35,6 +35,8 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JRootPane; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.Component; @@ -44,6 +46,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; import java.io.InputStream; +import java.util.LinkedHashMap; +import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -78,13 +82,35 @@ public class AboutPanelHandler { }; public void setLicenseFile(String filename) { - String load = load(filename); - ui.setLicenseText(load); + addTab(t("aboutframe.license"), filename); } public void setThirdpartyFile(String filename) { - String load = load(filename); - ui.setThirdpartyText(load); + addTab(t("aboutframe.thirdparty"), filename); + } + + protected Map<String, String> extraTabs = new LinkedHashMap<String, String>(); + + public void addTab(String tabTitle, String resourceName) { + String tabContent = load(resourceName); + + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setBorder(null); + ui.tabs.add(scrollPane); + ui.tabs.setTitleAt(ui.tabs.getTabCount() - 1, tabTitle); + + final JTextArea textArea = new JTextArea(); + textArea.setText(tabContent); + textArea.setEditable(false); + scrollPane.getViewport().add(textArea); + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + textArea.setCaretPosition(0); + } + }); + } public void buildTopPanel() { @@ -103,29 +129,6 @@ public class AboutPanelHandler { if (ui.getAboutText() == null) { ui.tabs.remove(ui.aboutContent); } - if (ui.getLicenseText() == null) { - ui.tabs.remove(ui.licenseContent); - } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.licenseTextArea.setCaretPosition(0); - } - }); - - } - if (ui.getThirdpartyText() == null) { - ui.tabs.remove(ui.thirdpartyContent); - } else { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - ui.thirdpartyTextArea.setCaretPosition(0); - } - }); - } } public void showInDialog(Frame ui, boolean undecorated) { @@ -134,7 +137,7 @@ public class AboutPanelHandler { if (this.ui.iconPath != null) { f.setIconImage(SwingUtil.createIcon(this.ui.iconPath).getImage()); } - f.setResizable(false); + f.setResizable(true); f.setSize(550, 450); f.setUndecorated(undecorated); JRootPane rootPane = f.getRootPane(); diff --git a/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_en_GB.properties b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_en_GB.properties new file mode 100644 index 0000000..180c699 --- /dev/null +++ b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_en_GB.properties @@ -0,0 +1,4 @@ +aboutframe.about=About +aboutframe.license=License +aboutframe.ok=OK +aboutframe.thirdparty=Third party diff --git a/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_es_ES.properties b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_es_ES.properties new file mode 100644 index 0000000..6f31c24 --- /dev/null +++ b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_es_ES.properties @@ -0,0 +1,4 @@ +aboutframe.about=A cerca de +aboutframe.license=Licecia +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie diff --git a/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_fr_FR.properties b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_fr_FR.properties new file mode 100644 index 0000000..6653653 --- /dev/null +++ b/jaxx-widgets-about/src/main/resources/i18n/jaxx-widgets-about_fr_FR.properties @@ -0,0 +1,4 @@ +aboutframe.about=À propos +aboutframe.license=Licence +aboutframe.ok=OK +aboutframe.thirdparty=Tierce partie diff --git a/jaxx-widgets-about/src/site/site.xml b/jaxx-widgets-about/src/site/site.xml new file mode 100644 index 0000000..8d5a39f --- /dev/null +++ b/jaxx-widgets-about/src/site/site.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JAXX :: Widgets + %% + Copyright (C) 2008 - 2014 Code Lutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + + <bannerLeft> + <name>${project.name}</name> + <src>${siteCommonResourcesUrl}/images/logos/jaxx-logo.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu ref="reports"/> + + </body> +</project> diff --git a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java b/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java index 2626d81..9cb6675 100644 --- a/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java +++ b/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanelHandler.java @@ -52,7 +52,9 @@ import static org.nuiton.i18n.I18n.t; * * @author Tony Chemit - chemit@codelutin.com * @since 2.4 + * @deprecated please use now jaxx-widgets-about module instead. */ +@Deprecated public class AboutPanelHandler { private static final Log log = LogFactory.getLog(AboutPanelHandler.class); diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties index 58156f2..3792a3f 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_en_GB.properties @@ -1,15 +1,9 @@ -aboutframe.about=About -aboutframe.license=License -aboutframe.ok=OK -aboutframe.thirdparty=Third party bean.action.selected.move.down=Move down bean.action.selected.move.down.tip=Move down the selected item bean.action.selected.move.up=Move up bean.action.selected.move.up.tip=Move up the selected item bean.action.selected.remove=Unselect bean.action.selected.remove.tip=Unselect the selected item -bean.action.selected.removeAll=Unselect all -bean.action.selected.removeAll.tip=Unselecte all items bean.popup.label=Object '%1$s' bean.sort.down=Descending sort bean.sort.down.tip=Actually, sort order is descending @@ -32,39 +26,6 @@ beandoublelist.popup.title=Change the sorted property beanlist.action.reset.tip=Reset the selected selection beanlist.action.sort.tip=Change the sorted property beanlist.popup.title=Change the sorted property -config.action.quit=Quit -config.action.quit.tip=Quit the configuration editor -config.action.reset=Cancel -config.action.reset.tip=Cancel the modifications for the category -config.action.save=Save -config.action.save.tip=Save the modifications for the category -config.choice.cancel=Cancel -config.choice.continue=Continue -config.choice.doNotSave=Do not save -config.choice.save=Save -config.defaultValue=Default value -config.defaultValue.tip=Default value of the option -config.description=Description -config.detected.callBack=Detected actions -config.error.category.already.exists=category with name '%1$s' does already exist\! -config.error.category.not.found=category with name '%1$s' does not exist\! -config.key=Key -config.key.tip=Key of the option -config.launch.callBack=Perform -config.launch.callBack.tip=Perform necessary actions -config.message.quit.invalid.category=The category '%1$s' is not valid\! -config.message.quit.valid.and.modified.category=The category '%1$s' has some modified options \: -config.modified=Option was modified (previous value \: %1$s) -config.no.option.selected=< No selected option > -config.option.final=This option can not be modified -config.option.label=Option '%1$s' (%2$s) -config.option.modified=Value is modified < original value \: '%1$s' - new value \: '%2$s' > -config.title=Preferences -config.title.need.confirm=A confirmation is required -config.unmodifiable=Can not be modified -config.unvalid=Option is not valid \! (previous value \: %1$s, required type \: %2$s) -config.value=Value -config.value.tip=Value of the option errorUI.action.close=Close errorUI.message=An error wad detected... errorUI.title=Error... @@ -98,11 +59,7 @@ numbereditor.8=8 numbereditor.9=9 numbereditor.action.reset.tip=Reset numbereditor.action.show.tip=Show numeric panel -numbereditor.cleanAll=C -numbereditor.cleanOne=CE numbereditor.clearAll=C numbereditor.clearOne=CE -numbereditor.dot=. -numbereditor.sign=- numbereditor.toggleSign=+/- timeeditor.H=H diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties index ee187b7..f314694 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_es_ES.properties @@ -1,15 +1,9 @@ -aboutframe.about=A cerca de -aboutframe.license=Licecia -aboutframe.ok=OK -aboutframe.thirdparty=Tierce partie bean.action.selected.move.down=Descendre bean.action.selected.move.down.tip=Descendre l'élément sélectionné bean.action.selected.move.up=Monter bean.action.selected.move.up.tip=Monter l'élément sélectionné bean.action.selected.remove=Supprimer bean.action.selected.remove.tip=Supprimer l'élément sélectionné -bean.action.selected.removeAll=Supprimer Tout -bean.action.selected.removeAll.tip=Supprimer tous les éléments bean.popup.label=Objeto '%1$s' bean.sort.down=Calsificación decreciente bean.sort.down.tip=Clasificación decreciente actualmente utilizada @@ -32,39 +26,6 @@ beandoublelist.popup.title=Modificar la clasificación beanlist.action.reset.tip=Eliminar la selección beanlist.action.sort.tip=Modificar la clasificación de la lista despleglable beanlist.popup.title=Modificar la clasificación -config.action.quit=Salir -config.action.quit.tip=Salir del editor de configuración -config.action.reset=Cancelar -config.action.reset.tip=Cancelar las modificaciones de esta categoría -config.action.save=Guardar -config.action.save.tip=Guardar las modificaciones de esta categoría -config.choice.cancel=Cancelar -config.choice.continue=Continuar -config.choice.doNotSave=No guardar -config.choice.save=Guardar -config.defaultValue=Valor por defecto -config.defaultValue.tip=Valor por defecto de la opción -config.description=Descripción -config.detected.callBack=Acciones detectadas para las opciones modificadas -config.error.category.already.exists=la categoría '%1$s' ya existe\! -config.error.category.not.found=La categoria '%1$s' no existe\! -config.key=Clave -config.key.tip=Calve de la opcion -config.launch.callBack=Lanzar -config.launch.callBack.tip=Lanzar las acciones necesarias -config.message.quit.invalid.category=La categoría '%1$s' no es valida\! -config.message.quit.valid.and.modified.category=La categoria '%1$s' tiene opciones modificadas \: -config.modified=Opción modificada (valor original \: %1$s) -config.no.option.selected=< No hay opciones seleccionadas > -config.option.final=Opción no modificable -config.option.label=Opción '%1$s' (%2$s) -config.option.modified=Valor modificado < valor anterior \: '%1$s' - nuevo valor \: '%2$s' > -config.title=Preferencias -config.title.need.confirm=Se requiere confirmación del usuario... -config.unmodifiable=No puede ser modificado -config.unvalid=Opción no valida (valor original \: %1$s, tipo requerido \: %2$s) -config.value=Valor -config.value.tip=Valor de la opción errorUI.action.close=Cerrar errorUI.message=ha habido un error \! errorUI.title=Error... @@ -98,11 +59,7 @@ numbereditor.8=8 numbereditor.9=9 numbereditor.action.reset.tip=Reinicializar numbereditor.action.show.tip=Mostar el teclado numérico -numbereditor.cleanAll=C -numbereditor.cleanOne=CE numbereditor.clearAll=C numbereditor.clearOne=CE -numbereditor.dot=. -numbereditor.sign=- numbereditor.toggleSign=+/- timeeditor.H=H diff --git a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties index 2e6616f..b9ea451 100644 --- a/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties +++ b/jaxx-widgets/src/main/resources/i18n/jaxx-widgets_fr_FR.properties @@ -1,15 +1,9 @@ -aboutframe.about=À propos -aboutframe.license=Licence -aboutframe.ok=OK -aboutframe.thirdparty=Tierce partie bean.action.selected.move.down=Descendre bean.action.selected.move.down.tip=Descendre l'élément sélectionné bean.action.selected.move.up=Monter bean.action.selected.move.up.tip=Monter l'élément sélectionné bean.action.selected.remove=Supprimer bean.action.selected.remove.tip=Supprimer l'élément sélectionné -bean.action.selected.removeAll=Supprimer Tout -bean.action.selected.removeAll.tip=Supprimer tous les éléments bean.popup.label=Objet '%1$s' bean.sort.down=Tri décroissant bean.sort.down.tip=Tri décroissant actuellement utilisé @@ -32,39 +26,6 @@ beandoublelist.popup.title=Modifier le tri beanlist.action.reset.tip=Supprimer la sélection beanlist.action.sort.tip=Modifier le tri de la liste déroulante beanlist.popup.title=Modifier le tri -config.action.quit=Quitter -config.action.quit.tip=Quitter l'éditeur de configuration -config.action.reset=Annuler -config.action.reset.tip=Annuler les modifications de cette catégorie -config.action.save=Enregistrer -config.action.save.tip=Sauver les modifications de cette catégorie -config.choice.cancel=Annuler -config.choice.continue=Continuer -config.choice.doNotSave=Ne pas enregistrer -config.choice.save=Enregistrer -config.defaultValue=Valeur par défaut -config.defaultValue.tip=Valeur par défaut de l'option -config.description=Description -config.detected.callBack=Actions détectées pour les options modifiées -config.error.category.already.exists=La catégorie de nom '%1$s' existe déjà\! -config.error.category.not.found=La catégorie de nom '%1$s' n'existe pas\! -config.key=Clef -config.key.tip=Clef de l'option -config.launch.callBack=Lancer -config.launch.callBack.tip=Lancer les actions nécessaires -config.message.quit.invalid.category=La catégorie '%1$s' n'est pas valide\! -config.message.quit.valid.and.modified.category=La catégorie '%1$s' possèdent des options modifiées \: -config.modified=Option modifiée (valeur originale \: %1$s) -config.no.option.selected=< Pas d'option sélectionnée > -config.option.final=Option non modifiable -config.option.label=Option '%1$s' (%2$s) -config.option.modified=Valeur modifiée < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > -config.title=Préférences -config.title.need.confirm=Une confirmation de votre part est requise... -config.unmodifiable=Ne peut pas être modifié -config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) -config.value=Valeur -config.value.tip=Valeur de l'option errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... @@ -98,11 +59,7 @@ numbereditor.8=8 numbereditor.9=9 numbereditor.action.reset.tip=Réinitialiser numbereditor.action.show.tip=Afficher le pavé numérique -numbereditor.cleanAll=C -numbereditor.cleanOne=CE numbereditor.clearAll=C numbereditor.clearOne=CE -numbereditor.dot=. -numbereditor.sign=- numbereditor.toggleSign=+/- timeeditor.H=H diff --git a/pom.xml b/pom.xml index bae8b27..6ed3c69 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ <module>jaxx-compiler</module> <module>jaxx-maven-plugin</module> <module>jaxx-widgets-common</module> + <module>jaxx-widgets-about</module> <module>jaxx-widgets-number</module> <module>jaxx-widgets-select</module> <module>jaxx-widgets</module> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.