Author: dandre
Date: Sun Sep 8 17:08:09 2013
New Revision: 4538
Log:
Replace development section in welcome screen by version history
Added:
trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Versions.java
- copied, changed from r4522,
/trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Blogs.java
Modified:
trunk/AncestrisCore/welcome/src/ancestris/welcome/resources/Bundle.properties
trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/WhatsNewTab.java
Modified:
trunk/AncestrisCore/welcome/src/ancestris/welcome/resources/Bundle.properties
==============================================================================
---
trunk/AncestrisCore/welcome/src/ancestris/welcome/resources/Bundle.properties
(original)
+++
trunk/AncestrisCore/welcome/src/ancestris/welcome/resources/Bundle.properties
Sun Sep 8 17:08:09 2013
@@ -16,8 +16,6 @@
#
# RSS Feeds
#
-LBL_Development=Development
-
LBL_ArticlesAndNews=News & Tutorials
#NOI18N
URL_ArticlesAndNews=http://www.arvernes.com/wiki/index.php?title=Sp%C3%A9cial:Modifications_r%C3%A9centes&feed=rss
@@ -30,16 +28,42 @@
ACN_AllArticles=Show all tutorials
ACD_AllArticles=Open the list of all tutorials in the default web browser
+# FIXME: Blogs section in not used anymore
+LBL_Blogs=Blogs
+#NOI18N
+URL_Blogs=http://www.arvernes.com/wiki/index.php/Ancestris_-_Blogs
+
+LBL_AllBlogs=All Blogs >>
+ACD_AllBlogs=Open list of all blogs in the default browser
+ACN_AllBlogs=Show all blogs
+
+# FIXME: Dev section in not used anymore
+LBL_SectionDevs=Developments
+LBL_Development=Development
+#NOI18N
+URL_Development=http://en.ancestris.org/index.php?title=Special:NewPages&feed=rss
+
LBL_AllDev=All Devs >>
#NOI18N
URL_AllDev=http://trac.ancestris.org/ancestris/timeline
-ACN_AllDev=Show all blogs
-ACD_AllDev=Open the list of all blogs in the default web browser
+ACN_AllDev=Show all devs
+ACD_AllDev=Open the list of all devs in the default web browser
+
+#NOI18N
+URL_AllOnlineDocs=http://en.ancestris.org/index.php?title=Documentation
LBL_AllOnlineDocs=All Online Documentation >>
ACN_AllOnlineDocs=Show all online documentation
ACD_AllOnlineDocs=Open the list of all documentation in the default web browser
+LBL_SectionVersions=Latest versions
+URL_Version=http://forum.ancestris.org/index.php?board=12.0&type=rss2&action=.xml
+LBL_AllVersions=All Versions >>
+#NOI18N
+URL_AllVersions=http://forum.ancestris.org/index.php?board=12.0
+ACN_AllVersions=Show all available versions
+ACD_AllVersions=Open the list of all versions and their descriptions in the
default web browser
+
#
# Other
#
@@ -78,15 +102,11 @@
LBL_Preferences=Configure Ancestris
WelcomePage/GettingStartedLinks/newgedcom.instance=Create a genealogy file
#NOI18N
-URL_AllOnlineDocs=http://en.ancestris.org/index.php?title=Documentation
-LBL_AllBlogs=All Blogs >>
-#NOI18N
URL_JavaLogo=http://java.sun.com
#NOI18N
URL_ArvernesLogo=http://www.ancestris.org
LBL_MyAncestrisTab=My Ancestris
LBL_SectionRecentFiles=Last opened genealogies
-LBL_SectionDevs=Developments
LBL_NewGedcom=Create a genealogy
LBL_OpenGedcom=Open a genealogy
#NOI18N
@@ -103,7 +123,6 @@
#NOI18N
RssDetailsColor=0x454545
WelcomePage/TutorialsLinks/tutorial3.url=Migration from another program
-LBL_Blogs=Blogs
#NOI18N
URL_Demo=http://www.arvernes.com/wiki/index.php/Ancestris_-_Demos
@@ -115,8 +134,6 @@
LinkColor=0x164B7B
WelcomePage/TutorialsLinks/tutorial1.url=First Steps
#NOI18N
-URL_Blogs=http://www.arvernes.com/wiki/index.php/Ancestris_-_Blogs
-#NOI18N
URL_AllArticles=http://en.ancestris.org/index.php?title=Documentation#Video
#NOI18N
LinkInFocusColor=0x000000
@@ -130,16 +147,12 @@
VisitedLinkColor=0x5591D2
#NOI18N
RssDateTimeColor=0xCA6900
-ACN_AllBlogs=Show all blogs
LBL_GoPreferences=Configure Ancestris >>
LBL_NewGedcomDescr=<html>This wizard will guide you step by step when creating
a new genealogy. It will help you to enter your first data. A good choice if
you are new to Ancestris</html>
LBL_OpenGedcomDescr=<html>Open a genealogy. You can load an existing genealogy
by opening its gedcom file.</html>
#NOI18N
MouseOverTabColor=0xE5E5E5
#NOI18N
-URL_Development=http://trac.ancestris.org/ancestris/timeline?ticket=on&wiki=on&max=10&format=rss
-ACD_AllBlogs=Open list of all blogs in the default browser
-#NOI18N
SectionHeaderColor=0x1D2153
WelcomePage/TutorialsLinks/tutorial5.url=Improve translations of Ancestris
WelcomePage/TutorialsLinks/tutorial4.url=Modify and enhance Ancestris
Copied: trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Versions.java
(from r4522, /trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Blogs.java)
==============================================================================
--- /trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Blogs.java
(original)
+++ trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/Versions.java Sun Sep
8 17:08:09 2013
@@ -41,9 +41,11 @@
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
*/
-
package ancestris.welcome.ui;
+import ancestris.welcome.content.BundleSupport;
+import ancestris.welcome.content.RSSFeedReaderPanel;
+import ancestris.welcome.content.WebLink;
import java.awt.BorderLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -51,30 +53,27 @@
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import ancestris.welcome.content.BundleSupport;
-import ancestris.welcome.content.RSSFeedReaderPanel;
-import ancestris.welcome.content.WebLink;
/**
*
* @author S. Aubrecht
*/
-class Blogs extends RSSFeedReaderPanel {
+class Versions extends RSSFeedReaderPanel {
- public Blogs() {
- super( "Development", false ); // NOI18N
+ public Versions() {
+ super("Version", false); // NOI18N
- add( buildBottomContent(), BorderLayout.SOUTH );
+ add(buildBottomContent(), BorderLayout.SOUTH);
}
protected JComponent buildBottomContent() {
- WebLink allBlogs = new WebLink( "AllDev", true ); // NOI18N
- BundleSupport.setAccessibilityProperties( allBlogs, "AllDev" );
//NOI18N
+ WebLink allVersions = new WebLink("AllVersions", true); // NOI18N
+ BundleSupport.setAccessibilityProperties(allVersions, "AllVersions");
//NOI18N
- JPanel panel = new JPanel( new GridBagLayout() );
+ JPanel panel = new JPanel(new GridBagLayout());
panel.setOpaque(false);
- panel.add( allBlogs, new
GridBagConstraints(1,0,1,1,0.0,0.0,GridBagConstraints.SOUTHEAST,GridBagConstraints.HORIZONTAL,new
Insets(5,5,0,5),0,0) );
- panel.add( new JLabel(), new
GridBagConstraints(0,0,1,1,1.0,0.0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new
Insets(0,0,0,0),0,0) );
+ panel.add(allVersions, new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0,
GridBagConstraints.SOUTHEAST, GridBagConstraints.HORIZONTAL, new Insets(5, 5,
0, 5), 0, 0));
+ panel.add(new JLabel(), new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0,
GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0,
0), 0, 0));
return panel;
}
Modified: trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/WhatsNewTab.java
==============================================================================
--- trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/WhatsNewTab.java
(original)
+++ trunk/AncestrisCore/welcome/src/ancestris/welcome/ui/WhatsNewTab.java
Sun Sep 8 17:08:09 2013
@@ -41,39 +41,38 @@
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
*/
-
package ancestris.welcome.ui;
+import ancestris.welcome.content.BundleSupport;
+import ancestris.welcome.content.ContentSection;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
-import ancestris.welcome.content.BundleSupport;
-import ancestris.welcome.content.ContentSection;
/**
*
* @author S. Aubrecht
*/
class WhatsNewTab extends AbstractTab {
-
+
public WhatsNewTab() {
- setName(BundleSupport.getLabel( "WhatsNewTab")); //NOI18N
+ setName(BundleSupport.getLabel("WhatsNewTab")); //NOI18N
}
@Override
protected void buildContent() {
- JPanel main = new JPanel( new GridLayout(1,0) );
+ JPanel main = new JPanel(new GridLayout(1, 0));
main.setOpaque(false);
main.setBorder(BorderFactory.createEmptyBorder());
- add( main, BorderLayout.CENTER );
+ add(main, BorderLayout.CENTER);
+
+ main.add(new ContentSection(BundleSupport.getLabel("SectionVersions"),
//NOI18N
+ new Versions(), false, true));
+ main.add(new
ContentSection(BundleSupport.getLabel("SectionNewsAndTutorials"), //NOI18N
+ new ArticlesAndNews(), true, true));
- main.add( new ContentSection( BundleSupport.getLabel(
"SectionNewsAndTutorials" ), //NOI18N
- new ArticlesAndNews(), false, true ));
-
- main.add( new ContentSection( BundleSupport.getLabel( "SectionDevs" ),
//NOI18N
- new Blogs(), true, true ) );
- add( new BottomBar(), BorderLayout.SOUTH );
+ add(new BottomBar(), BorderLayout.SOUTH);
}
}
---------------------------------------------------------------------
Site Web Ancestris : http://www.ancestris.org
<*> Pour vous desinscrire de cette liste, envoyez un mail a :
[email protected]
<*> Pour obtenir de l'aide sur les commandes de la liste :
[email protected]
Pour obtenir tous les messages lies a ce fil de discussion, cliquez sur le
lien ci-dessous, cela ouvrira votre logiciel de messagerie. Il vous suffira
d'envoyer le message :
[email protected]
