Author: jerome
Date: 2008-08-21 15:57:36 +0200 (Thu, 21 Aug 2008)
New Revision: 1562
Removed:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/images/thumb-selected.png
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/images/thumb-simple.png
Modified:
software_suite_v2/software/control_center/trunk/control_center/MANIFEST.MF
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/ThumbnailContainer.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttituneAlertPanel.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
Log:
* Fixed some bugs
* Added some sentences to the language properties file
* Changed gadgets list display layout
* Changed menu + added separators.
* Fixed properties panel bug
* Fixed bug switching between lists.
* Added langages / tux speak menu + pitch
* ...
Modified:
software_suite_v2/software/control_center/trunk/control_center/MANIFEST.MF
===================================================================
--- software_suite_v2/software/control_center/trunk/control_center/MANIFEST.MF
2008-08-20 16:57:53 UTC (rev 1561)
+++ software_suite_v2/software/control_center/trunk/control_center/MANIFEST.MF
2008-08-21 13:57:36 UTC (rev 1562)
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
-Class-Path: ./jdic.jar ./jdic.dll ./tray.dll ./IeEmbed.exe
+Class-Path: ./jdic.jar ./jdic.dll ./tray.dll ./IeEmbed.exe ./jdic_stub.jar
Main-Class: cc_main
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -53,6 +53,7 @@
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
+import java.util.Hashtable;
import java.util.Locale;
import java.util.UUID;
import java.util.Vector;
@@ -108,6 +109,7 @@
import com.tuxdroid.cc.swing.About;
import com.tuxdroid.cc.swing.EventDispatcher;
import com.tuxdroid.cc.swing.TuxDegradeePanel;
+import com.tuxdroid.cc.swing.TuxDegradeePanelWithInset;
import com.tuxdroid.cc.swing.TuxDegradeeScrollPane;
import com.tuxisalive.api.SThread;
import com.tuxisalive.api.TuxAPI;
@@ -252,7 +254,9 @@
ImageIcon tray_show = new
ImageIcon(getClass().getResource("images/show.png"));
public JPopupMenu menuTray;
- TuxLanguagesMenu interfaceMenusLang;
+ TuxLanguagesMenu interfaceMenusLang;
+
+ Hashtable<String, Object[]> savedProperties = new Hashtable<String,
Object[]>();
/**
* CcInterface constructor.
@@ -298,7 +302,6 @@
file_browser.addPropertyChangeListener(this);
this.setTrayIcon();
- //TODO remove this test.
interfaceMenusLang = new TuxLanguagesMenu(tux, this.settings,
this.language);
}
@@ -770,7 +773,59 @@
functions.mask(fileMenu, new Rectangle(p.x, p.y, 50,
24),
getClass().getResource(path+"file.png"));
popupFileMenu = new JPopupMenu();
-
+
+ //Create sub menus languages.
+ if(this.interfaceMenusLang.haveLanguages()){
+ JMenu languages = new
JMenu(language.getMenuViewLanguage());
+ for(JMenuItem items :
this.interfaceMenusLang.getInterfaceLanguagesMenus()){
+ languages.add(items);
+ }
+ popupFileMenu.add(languages);
+ }
+
+ if(!this.interfaceMenusLang.areLocutorsInitialized()){
+ this.initializeLocutors();
+
this.interfaceMenusLang.setLocutorsInitialized(true);
+ }
+
+ //Create pitch menu.
+ final int pitchValue = settings.getPitch();
+ final JMenu pitch = new
JMenu(language.getPitchMenuCaption());
+ final JMenuItem plus = new
JMenuItem(language.getPitchCaptionPlus());
+ final JMenuItem minder = new
JMenuItem(language.getPitchCaptionMinder());
+
+ pitch.add(plus);
+ pitch.add(minder);
+
+ plus.addMouseListener(new java.awt.event.MouseAdapter(){
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ if(settings.getPitch() < 200){
+
settings.setPitch(settings.getPitch() + 10);
+
((JMenuItem)event.getSource()).setText(language.getPitchCaptionPlus());
+
minder.setText(language.getPitchCaptionMinder());
+
+
tux.tts.setPitch(settings.getPitch());
+ }
+ }
+ });
+
+ minder.addMouseListener(new
java.awt.event.MouseAdapter(){
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ if(settings.getPitch() > 0){
+
settings.setPitch(settings.getPitch() - 10);
+
((JMenuItem)event.getSource()).setText(language.getPitchCaptionMinder());
+
+
plus.setText(language.getPitchCaptionPlus());
+
+
tux.tts.setPitch(settings.getPitch());
+ }
+ }
+ });
+
+ if(this.interfaceMenusLang.haveLocutor()){
+ popupFileMenu.add(pitch);
+ }
+ popupFileMenu.addSeparator();
//Add exit menu item that allow to exit application.
exit = new JMenuItem(language.getMenuFileExit());
exit.addMouseListener(new ExitSubMenuListener(path));
@@ -785,7 +840,7 @@
//Change image clicking on File item.
fileMenu.addMouseListener(new
java.awt.event.MouseAdapter() {
public void
mousePressed(java.awt.event.MouseEvent e) {
- popupFileMenu.show(jFrame,
fileMenu.getX() + 7, fileMenu
+ popupFileMenu.show(jFrame,
fileMenu.getX() , fileMenu
.getY() +
fileMenu.getHeight() + 4);
}
});
@@ -805,7 +860,8 @@
Point p = language.getMenuHelpLocation();
functions.mask(helpMenu, new Rectangle(p.x, p.y, 53,
24),
getClass().getResource(path+"help.png"));
- popupHelpMenu = new JPopupMenu();
+ popupHelpMenu = new JPopupMenu();
+
//Adding items.
JMenuItem help = new
JMenuItem(language.getMenuHelpOnlineHelp());
help.addMouseListener(new
OpenLinkListener("http://www.tuxisalive.com/getting-started";));
@@ -871,27 +927,29 @@
}
});
toolsMenu.addMouseMotionListener(new
HandCursorChanger(jContentPane));
-
- //Adding port selection menu item.
- JMenuItem port = new
JMenuItem(language.getIpSelectionCaption());
- port.addMouseListener(new IPSelectionListener());
- //Adding show debugger function.
- JMenuItem debugger = new
JMenuItem(language.showDebuggerCaption());
- debugger.addMouseListener(new
java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
- file_browser.showDebugger(true);
- }
- });
-
- //Adding items.
- popupmenu1.add(port);
- popupmenu1.add(debugger);
//Adding reals tools.
for(JMenuItem item : this.toolsMenus){
popupmenu1.add(item);
}
-
+
+ popupmenu1.addSeparator();
+ JMenu advancedMenu = new
JMenu(language.getToolMenuAdvanced());
+
+ //Adding ip selection menu item.
+ JMenuItem port = new
JMenuItem(language.getIpSelectionCaption());
+ port.addMouseListener(new IPSelectionListener());
+ //Adding show debugger function.
+ JMenuItem debugger = new
JMenuItem(language.showDebuggerCaption());
+ debugger.addMouseListener(new
java.awt.event.MouseAdapter(){
+ public void
mousePressed(java.awt.event.MouseEvent event){
+ file_browser.showDebugger(true);
+ }
+ });
+
+ advancedMenu.add(port);
+ advancedMenu.add(debugger);
+ popupmenu1.add(advancedMenu);
}
return toolsMenu;
}
@@ -905,7 +963,7 @@
for(JMenuItem items :
this.interfaceMenusLang.getTuxLocutorsMenus()){
speaker.add(items);
}
- popupmenu2.add(speaker);
+ popupFileMenu.add(speaker);
}
}
@@ -924,57 +982,8 @@
popupmenu2 = new JPopupMenu();
URL one = getClass().getResource(path+"view.png");
URL two = getClass().getResource(path+"view_over.png");
- URL three = getClass().getResource(path+"view.png");
+ URL three = getClass().getResource(path+"view.png");
- //Create sub menus languages.
- if(this.interfaceMenusLang.haveLanguages()){
- JMenu languages = new
JMenu(language.getMenuViewLanguage());
- for(JMenuItem items :
this.interfaceMenusLang.getInterfaceLanguagesMenus()){
- languages.add(items);
- }
- popupmenu2.add(languages);
- }
-
- if(!this.interfaceMenusLang.areLocutorsInitialized()){
- this.initializeLocutors();
-
this.interfaceMenusLang.setLocutorsInitialized(true);
- }
-
- //Create pitch menu.
- final int pitchValue = settings.getPitch();
- final JMenu pitch = new
JMenu(String.format(language.getPitchMenuCaption()));
- final JMenuItem plus = new
JMenuItem(String.format(language.getPitchCaptionPlus(), pitchValue));
- final JMenuItem minder = new
JMenuItem(String.format(language.getPitchCaptionMinder(), pitchValue));
-
- pitch.add(plus);
- pitch.add(minder);
-
- plus.addMouseListener(new java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
- if(settings.getPitch() < 200){
-
settings.setPitch(settings.getPitch() + 10);
-
((JMenuItem)event.getSource()).setText(String.format(language.getPitchCaptionPlus(),
-
settings.getPitch()));
-
minder.setText(String.format(language.getPitchCaptionMinder(),
-
settings.getPitch()));
-
tux.tts.setPitch(settings.getPitch());
- }
- }
- });
-
- minder.addMouseListener(new
java.awt.event.MouseAdapter(){
- public void
mousePressed(java.awt.event.MouseEvent event){
- if(settings.getPitch() > 0){
-
settings.setPitch(settings.getPitch() - 10);
-
((JMenuItem)event.getSource()).setText(String.format(language.getPitchCaptionMinder(),
-
settings.getPitch()));
-
plus.setText(String.format(language.getPitchCaptionPlus(),
-
settings.getPitch()));
-
tux.tts.setPitch(settings.getPitch());
- }
- }
- });
-
popupmenu2.addPopupMenuListener(new MenuListener(one,
two, three, viewMenu));
//Show list view menu option.
JMenuItem showlist = new
JMenuItem(language.getMenuViewListView());
@@ -998,10 +1007,7 @@
}
});
- //Adding items.
- if(this.interfaceMenusLang.haveLocutor()){
- popupmenu2.add(pitch);
- }
+ //Adding items.
popupmenu2.add(showlist);
popupmenu2.add(showthumb);
popupmenu2.add(showHideBottomFrame);
@@ -1441,7 +1447,14 @@
scroll_fileBrowser_thumbnailGadgets.setVisible(true);
}
type = CcInterface.TYPE_GADGETS;
- this.unMaskGadgetsTabs();
+ this.maskAllTabs();
+ if(((file_browser.getListViewSelectedIndex() != -1) ||
+
file_browser.thumbnailGadgets.haveSelectedThumb()) &
+
this.savedProperties.containsKey("gadget")){
+ JPanel[] panels = (JPanel[])
this.savedProperties.get("gadget");
+
this.jTabbedPane.add(language.getPanelSummary(), panels[0]);
+ this.jTabbedPane.add(language.getPanelHelp(),
panels[1]);
+ }else this.maskGadgetsTabs();
}
else if (index == 1){
if(view == CcInterface.VIEW_LIST){
@@ -1453,7 +1466,14 @@
scroll_fileBrowser_thumbnailAttitunes.setVisible(true);
}
type = CcInterface.TYPE_ATTITUNES;
- this.maskGadgetsTabs();
+ this.maskAllTabs();
+ if(((file_browser.getAttitunesViewSelectedIndex() !=
-1) ||
+
file_browser.thumbnailAttitunes.haveSelectedThumb()) &
+
this.savedProperties.containsKey("attitune")){
+ JPanel[] panel =
(JPanel[])this.savedProperties.get("attitune");
+
this.jTabbedPane.add(language.getPanelSummary(), panel[0]);
+ }
+ else this.maskGadgetsTabs();
}
this.setControlsConsistanceEnabled(true);
jTabbedPane.setEnabled(true);
@@ -1576,19 +1596,50 @@
this.scroll_fileBrowser_thumbnailAttitunes.setVisible(false);
this.scroll_fileBrowser_thumbnailGadgets.setVisible(false);
this.jListLibrary.clearSelection();
-
+ //TODO
if(index == 1){
remotePlaylist.setVisible(true);
alertPlaylist.setVisible(false);
type = CcInterface.TYPE_REMOTELIST;
this.jListPlaylists.setSelectedIndex(1);
this.setViewButtonsEnabled(false);
+ if(remotePlaylist.getSelectedIndex() != -1){
+ String title="remote";
+ Object[] pan =
this.savedProperties.get("remote");
+ this.maskAllTabs();
+
if(remotePlaylist.getSelectedItemKind().equalsIgnoreCase("gadget")){
+ title =
language.getPanelConfiguration();
+ this.jTabbedPane.addTab(title,
(TuxDegradeeScrollPane)pan[0]);
+ }
+ else{
+ title = language.getPanelSummary();
+ this.jTabbedPane.addTab(title,
(TuxDegradeePanelWithInset)pan[0]);
+ }
+
+ }else{
+ this.maskGadgetsTabs();
+ }
+
}else if(index == 0){
alertPlaylist.setVisible(true);
remotePlaylist.setVisible(false);
type = CcInterface.TYPE_ALERT;
this.jListPlaylists.setSelectedIndex(0);
this.setViewButtonsEnabled(false);
+ if(alertPlaylist.getSelectedIndex() != -1){
+ Object[] pan =
this.savedProperties.get("alert");
+ this.maskAllTabs();
+
if(alertPlaylist.getSelectedItemKind().equalsIgnoreCase("gadget")){
+
this.jTabbedPane.addTab(language.getPanelAlarm(), (TuxDegradeePanel)pan[0]);
+ this.jTabbedPane.addTab("Gadget " +
language.getPanelConfiguration(),
+
(TuxDegradeeScrollPane)pan[1]);
+ }else{
+
this.jTabbedPane.addTab(language.getPanelAlarm(), (TuxDegradeePanel)pan[0]);
+ }
+ }
+ else{
+ this.maskGadgetsTabs();
+ }
}
jFrame.repaint();
}
@@ -1885,16 +1936,24 @@
getClass().getResource("images/buttons/play.png")));
//file_browser.stopPlaying();
this.playButton.doClick();
+ }//FIXME
+ else
if(arg0.getPropertyName().equalsIgnoreCase("Attitune-Selection-Changed")){
+ TuxDegradeePanelWithInset panel =
(TuxDegradeePanelWithInset)arg0.getNewValue();
+ this.maskAllTabs();
+ this.jTabbedPane.addTab(language.getPanelSummary(),
panel);
+ this.savedProperties.put("attitune", new
JPanel[]{panel});
}
//A gadget selection changed event has been reveived.
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
-
+ System.out.println("gadget selection changed from
main");
Object obj = (Object)arg0.getNewValue();
JPanel[] readOnlyPanels = (JPanel[])obj;
this.maskAllTabs();
this.jTabbedPane.addTab(language.getPanelSummary(),
(JPanel)readOnlyPanels[0]);
- this.jTabbedPane.addTab(language.getPanelHelp(),
(JPanel)readOnlyPanels[1]);
+ this.jTabbedPane.addTab(language.getPanelHelp(),
(JPanel)readOnlyPanels[1]);
+ this.savedProperties.put("gadget", new
JPanel[]{(JPanel)readOnlyPanels[0],
+
(JPanel)readOnlyPanels[1]});
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-stopped")){
@@ -1951,6 +2010,7 @@
iconFile);
this.jTabbedPane.addTab(language.getPanelConfiguration(), pane);
+ this.savedProperties.put("remote", new
Object[]{pane});
}
else if(ty.equalsIgnoreCase("attitune")){
this.maskAllTabs();
@@ -1958,6 +2018,7 @@
String desc =
file_browser.getAttituneDescriptionFromPath(path);
file_browser.addDescription(desc, panel);
jTabbedPane.add(language.getPanelDescription(),
panel);
+ this.savedProperties.put("remote", new
Object[]{panel});
jFrame.pack();
}
}
@@ -1997,7 +2058,7 @@
if(kind.equalsIgnoreCase("attitune")){
this.maskAllTabs();
- final AttituneAlertPanel panel = new
AttituneAlertPanel();
+ final AttituneAlertPanel panel = new
AttituneAlertPanel(language);
//Setting registered values.
panel.setSchedulType("every");
@@ -2092,14 +2153,15 @@
});
this.jTabbedPane.add(language.getPanelAlarm(),
cont);
+ this.savedProperties.put("alert", new
Object[]{cont});
jFrame.repaint();
jFrame.pack();
}
else if(kind.equalsIgnoreCase("gadget")){
this.maskAllTabs();
//Time config panel.
- final SimpleAlertSettings alertSimpleSetting =
new SimpleAlertSettings();
- final GadgetAlertPanel gadgetPanel = new
GadgetAlertPanel(file_browser.getAttitunesList());
+ final SimpleAlertSettings alertSimpleSetting =
new SimpleAlertSettings(language);
+ final GadgetAlertPanel gadgetPanel = new
GadgetAlertPanel(file_browser.getAttitunesList(), language);
//Action config panel.
alertSimpleSetting.setLocation(new Point(10,0));
gadgetPanel.setLocation(new Point(246, 0));
@@ -2290,7 +2352,8 @@
});
this.jTabbedPane.addTab(language.getPanelAlarm(), cont);
- this.jTabbedPane.addTab("Gadget", pane);
+ this.jTabbedPane.addTab("Gadget "
+language.getPanelConfiguration(), pane);
+ this.savedProperties.put("alert", new
Object[]{cont, pane});
jFrame.repaint();
jFrame.pack();
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -209,5 +209,9 @@
if(arg0.getPropertyName().equals("generic-right-click")){
this.firePropertyChange("instances-editions-request",
null, null);
}
+ }
+
+ public int getSelectedIndex(){
+ return this.playlist.getSelectedRow();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -212,5 +212,9 @@
if(evt.getPropertyName().equals("generic-right-click")){
this.firePropertyChange("instances-editions-request",
null, null);
}
+ }
+
+ public int getSelectedIndex(){
+ return this.playlist.getSelectedRow();
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -22,6 +22,7 @@
package com.tuxdroid.cc.Object.PseudoFileBrowser;
+import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.Image;
import java.beans.PropertyChangeEvent;
@@ -48,6 +49,7 @@
import com.tuxdroid.cc.Utils.GadgetsFramework;
import com.tuxdroid.cc.Utils.image;
import com.tuxdroid.cc.Utils.languages.Languages;
+import com.tuxdroid.cc.swing.TuxDegradeePanelWithInset;
public class FileBrowser implements PropertyChangeListener{
@@ -104,7 +106,6 @@
File gadgets_file = new File(GadgetsDirectory);
File attitunes_file = new File(AttitunesDirectory);
- //TODO if empty then copy some gadgets/attitunes
presents into ressources.
//Create directories if don't exists.
if(!(gadgets_file.exists())){
gadgets_file.mkdir();
@@ -181,13 +182,18 @@
else
if(arg0.getPropertyName().equalsIgnoreCase("AttituneError")){
changes.firePropertyChange("AttituneReadingError", null, null);
}
-
+ //FIXME
else
if(arg0.getPropertyName().equalsIgnoreCase("Attitune-Selection-Changed")){
//then update attitune description.
String description =
arg0.getNewValue().toString();
- if(description != null){
-
this.addDescription(description.toString());
- }
+
+ this.getAttitunesDescriptionsPanel();
+ JLabel desc = new JLabel(description);
+ desc.setIcon(new
ImageIcon(TuxAttitunesListView.class.getResource("images/att.png")));
+ this.attituneDescription.add(desc);
+
changes.firePropertyChange("Attitune-Selection-Changed", null,
+
this.attituneDescription);
+
}
/** Gadgets dedicated events **/
@@ -202,7 +208,7 @@
changes.firePropertyChange("Gadget-Selection-Changed", null,
(Object[])arg0.getNewValue());
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadgets-Thumbnail-Selection-Changed")){
-
changes.firePropertyChange("Gadget-Selection-Changed", null,
arg0.getNewValue());
+
changes.firePropertyChange("Gadget-Selection-Changed", null,
(Object[])arg0.getNewValue());
}
else
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-stopped")){
@@ -309,9 +315,9 @@
gdgTemp[index][0] = datas[0];
//gadget name
gdgTemp[index][1] = datas[1];
+ //gadget description
+ gdgTemp[index][2] = datas[2];
//gadget author
- gdgTemp[index][2] = datas[2];
- //gadget description.
gdgTemp[index][3] = datas[3];
//gadget icon path
gdgTemp[index][4] = datas[4];
@@ -338,9 +344,9 @@
//gadget name
gdgTemp[index][0] = datas[1];
//Gadget Type.
- gdgTemp[index][1] = datas[2];
+ gdgTemp[index][1] = datas[3];
//Description
- gdgTemp[index][2] = datas[3];
+ gdgTemp[index][2] = datas[2];
GadgetsDatasToDisplay = gdgTemp;
}
@@ -348,8 +354,8 @@
private JScrollPane createListView(){
String[] column_headers =
{language.getGdgAttNameHeader(),
-
language.getAttAuthorHeader(),
-
language.getGdgAttDescriptionHeader()};
+
language.getGdgAttDescriptionHeader(),
+
language.getAttAuthorHeader()};
gadgetsListView = new
TuxGadgetsListView(GadgetsDatasToDisplay, GadgetsDatas, column_headers);
return gadgetsListView.getTable();
}
@@ -548,7 +554,7 @@
public JPanel getAttitunesDescriptionsPanel(){
- attituneDescription = new
com.tuxdroid.cc.swing.TuxDegradeePanelWithInset();
+ attituneDescription = new TuxDegradeePanelWithInset();
attituneDescription.setLayout(new GridLayout(2,0));
return attituneDescription;
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/ThumbnailContainer.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/ThumbnailContainer.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/ThumbnailContainer.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -132,12 +132,14 @@
return retour;
}
else{
- return retour;
+ return null;
}
}
- public String getSelectedThumbName(){
- return getSelectedName()[0].toString();
+ public String getSelectedThumbName(){
+ if(getSelectedName() != null)
+ return getSelectedName()[0].toString();
+ return "";
}
Deleted:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/images/thumb-selected.png
===================================================================
(Binary files differ)
Deleted:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Thumbnail/images/thumb-simple.png
===================================================================
(Binary files differ)
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -115,6 +115,13 @@
public void setNewModel(TuxAttitunesListView model){
modele = model;
+ }
+
+ public boolean haveSelectedThumb(){
+ if(cont.getSelectedThumbName() == null){
+ return false;
+ }
+ return true;
}
private Integer getSelectedModelIndex(){
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsListView.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -306,9 +306,9 @@
}
public String[] getSelectedIndexDatas(){
- String description = this.getValueAt(2,
this.getSelectedIndex()).toString();
+ String description = this.getValueAt(1,
this.getSelectedIndex()).toString();
String name = this.getValueAt(0,
this.getSelectedIndex()).toString();
- String gdgType = this.getValueAt(1,
this.getSelectedIndex()).toString();
+ String gdgType = this.getValueAt(2,
this.getSelectedIndex()).toString();
return new String[]{name, gdgType, description};
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxGadgetsThumbnailView.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -91,9 +91,15 @@
public void setSelected(int index){
cont.setSelected(index);
+ }
+
+ public boolean haveSelectedThumb(){
+ if(cont.getSelectedThumbName() == null){
+ return false;
+ }
+ return true;
}
-
@SuppressWarnings("deprecation")
public void updateThumbs(TuxGadgetsListView model){
//add a thumb there
@@ -229,23 +235,19 @@
else
if(arg0.getPropertyName().equalsIgnoreCase("Thumbnail-Selection-Changed")){
try{
- int privateIndex = this.getSelectedModelIndex();
- //If a matching values has been found into the
communicated privates datas.
- if(privateIndex != -1){
- JPanel[] readOnlyPanels;
-
- //Getting read only panels.
- readOnlyPanels =
modele.createGadgetsPanelsInfos(privateIndex); //problem here.
-
- //Getting writables panels.
- GadgetPropertyEditor propertyEditor =
new GadgetPropertyEditor();
-
propertyEditor.setGadget(this.getSelectedGadget().getGadget());
-
- Object[] obj = new
Object[]{readOnlyPanels, propertyEditor};
-
this.firePropertyChange("Gadget-Selection-Changed", null, obj);
- }
- }
- catch(Exception noObject){}
+ int privateIndex = this.getSelectedModelIndex();
+ //If a matching values has been found
into the communicated privates datas.
+ if(privateIndex != -1){
+ JPanel[] readOnlyPanels;
+ //Getting read only panels.
+ readOnlyPanels =
this.modele.createGadgetsPanelsInfos(privateIndex); //problem here.
+
+ //Getting writables panels.
+ Object obj = readOnlyPanels;
+
this.firePropertyChange("Gadget-Selection-Changed", null, obj);
+ }
+ }
+ catch(Exception noObject){}
}
else
if(arg0.getPropertyName().equalsIgnoreCase("double-click")){
this.firePropertyChange("gadget-double-click", null,
null);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttituneAlertPanel.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttituneAlertPanel.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttituneAlertPanel.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -21,6 +21,8 @@
*/
package com.tuxdroid.cc.Utils;
+
+import com.tuxdroid.cc.Utils.languages.Languages;
/**
* This object is a simple attitune alert configuration panel.
@@ -30,8 +32,8 @@
private static final long serialVersionUID = -1137899358688065277L;
- public AttituneAlertPanel(){
- super();
+ public AttituneAlertPanel(Languages language){
+ super(language);
setVisible(true);
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/GadgetAlertPanel.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -36,6 +36,7 @@
import javax.swing.JTextField;
import javax.swing.border.Border;
+import com.tuxdroid.cc.Utils.languages.Languages;
import com.tuxdroid.cc.swing.TuxDegradeePanel;
import com.tuxdroid.cc.swing.TuxRadioButton;
@@ -44,7 +45,8 @@
*/
public class GadgetAlertPanel extends TuxDegradeePanel{
- private static final long serialVersionUID = 8658564180426606755L;
+ private static final long serialVersionUID = 8658564180426606755L;
+ private Languages language;
//Alert configuration components.
JRadioButton AttituneAction = null;
@@ -58,10 +60,11 @@
ArrayList<Object> values;
- public GadgetAlertPanel(ArrayList<Object> list){
- super();
+ public GadgetAlertPanel(ArrayList<Object> list, Languages language){
+ super();
+ this.language = language;
this.values = list;
- Border title = BorderFactory.createTitledBorder("Alert
configuration");
+ Border title =
BorderFactory.createTitledBorder(language.getPanelAlertSchedulConfTitle());
setBorder(title);
setSize(new Dimension(352, 94));
setPreferredSize(getSize());
@@ -82,7 +85,7 @@
this.AttituneAction.setBorderPainted(false);
this.AttituneAction.setContentAreaFilled(false);
this.TTSAction = new JRadioButton(new TuxRadioButton());
- this.TTSAction.setText("TTS message");
+ this.TTSAction.setText(language.getPanelAlertSchedulConfTTS());
this.TTSAction.setSize(new Dimension(110, 20));
this.TTSAction.setPreferredSize(this.TTSAction.getSize());
this.TTSAction.setOpaque(true);
@@ -90,7 +93,7 @@
this.TTSAction.setBorderPainted(false);
this.TTSAction.setContentAreaFilled(false);
this.StartGadget = new JRadioButton(new TuxRadioButton());
- this.StartGadget.setText("Start gadget");
+
this.StartGadget.setText(language.getPanelAlertSchedulConfStartGdg());
this.StartGadget.setSize(new Dimension(110, 20));
this.StartGadget.setPreferredSize(this.StartGadget.getSize());
this.StartGadget.setOpaque(true);
@@ -136,7 +139,7 @@
public void getTTSEntry(){
- this.TTSMessage = new JTextField("Something changed");
+ this.TTSMessage = new
JTextField(language.getPanelAlertSchedulConfTTSMessages());
this.TTSMessage.setSize(this.AttituneSelection.getSize());
this.TTSMessage.setPreferredSize(this.TTSMessage.getSize());
this.TTSMessage.setBackground(new Color(241,241,241));
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/SimpleAlertSettings.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -34,6 +34,7 @@
import javax.swing.border.Border;
import javax.swing.JLabel;
+import com.tuxdroid.cc.Utils.languages.Languages;
import com.tuxdroid.cc.swing.TuxDegradeePanel;
import com.tuxdroid.cc.swing.TuxRadioButton;
@@ -41,7 +42,8 @@
public class SimpleAlertSettings extends TuxDegradeePanel{
- private static final long serialVersionUID = 3641095750197823844L;
+ private static final long serialVersionUID = 3641095750197823844L;
+ private Languages language;
//Time settings components.
JRadioButton EveryButton = null;
JRadioButton FixedTimeButton = null;
@@ -55,13 +57,14 @@
JLabel minutes;
JLabel h;
- public SimpleAlertSettings(){
- super();
- Border title = BorderFactory.createTitledBorder("Time
Settings");
+ public SimpleAlertSettings(Languages language){
+ super();
+ this.language = language;
+ Border title =
BorderFactory.createTitledBorder(language.getPanelAlertConfTitle());
setBorder(title);
setSize(new Dimension(226, 94));
GroupAlertSettings = new ButtonGroup();
- minutes = new JLabel("minutes");
+ minutes = new JLabel(language.getPanelAlertConfMins());
h = new JLabel(":");
minutes.setSize(new Dimension(60, 20));
h.setSize(new Dimension(20, 20));
@@ -87,7 +90,7 @@
public JRadioButton getEveryButton(){
if(EveryButton == null){
EveryButton = new JRadioButton(new TuxRadioButton());
- EveryButton.setText("Start every");
+ EveryButton.setText(language.getPanelAlertConfEvery());
EveryButton.setSize(new Dimension(100, 20));
EveryButton.setPreferredSize(EveryButton.getSize());
GroupAlertSettings.add(EveryButton);
@@ -105,7 +108,7 @@
public JRadioButton getFixedTimeButton(){
if(FixedTimeButton == null){
FixedTimeButton = new JRadioButton(new
TuxRadioButton());
- FixedTimeButton.setText("Start at time");
+
FixedTimeButton.setText(language.getPanelAlertConfStartAt());
FixedTimeButton.setSize(new Dimension(100, 20));
FixedTimeButton.setPreferredSize(FixedTimeButton.getSize());
GroupAlertSettings.add(FixedTimeButton);
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxLanguagesMenu.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -23,6 +23,7 @@
package com.tuxdroid.cc.Utils;
import java.io.File;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Vector;
@@ -39,6 +40,8 @@
private Settings settings;
private Languages language;
+ private File[] languages;
+
//Menus
private Vector<JMenuItem> locutorsMenus = new Vector<JMenuItem>();
private Vector<JMenuItem> interfaceLangMenus = new Vector<JMenuItem>();
@@ -62,11 +65,15 @@
/** Gets languages **/
private void getAvailablesLang(){
- File directory = new
File(com.tuxdroid.cc.Utils.languages.Languages.class.getResource("LanguagesSet").getPath());
- for(String f : directory.list()){
- if(f.contains("languages")){
- interfaceLanguages.add(f);
- }
+
+ this.languages = new File[]{
+ new
File(getClass().getResource("languages/LanguagesSet/languages_en_US.properties").getFile()),
+ new
File(getClass().getResource("languages/LanguagesSet/languages_fr_FR.properties").getFile())
+ };
+
+
+ for(File f : this.languages){
+ interfaceLanguages.add(f.getName());
}
}
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/TuxToolsMenu.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -33,6 +33,8 @@
private File location;
private File[] toolsList = null;
private Vector<JMenuItem> toolsMenus;
+ private Vector<JMenuItem> hash = new Vector<JMenuItem>();
+
private final String lang;
public TuxToolsMenu(String lang){
@@ -57,15 +59,56 @@
}
private void setMenu(){
+ Vector<JMenuItem> tmp = new Vector<JMenuItem>();
for(File tool : this.toolsList){
if(tool.exists()){
String name = tool.getName();
+
JMenuItem oneTool = this.createToolMenu(name,
tool);
- toolsMenus.add(oneTool);
+ if(oneTool.getText().equalsIgnoreCase("control
the droid")) hash.add(oneTool);
+ else
if(oneTool.getText().equalsIgnoreCase("attitunes studio")) hash.add(oneTool);
+ else
if(oneTool.getText().equalsIgnoreCase("chatter tux")) hash.add(oneTool);
+ else
if(oneTool.getText().equalsIgnoreCase("firmware updater")) hash.add(oneTool);
+ else tmp.add(oneTool);
}
}
+
+ sortVector(hash);
+
+ for(JMenuItem item : this.hash){
+ this.toolsMenus.add(item);
+ }
+ for(JMenuItem item : tmp){
+ this.toolsMenus.add(item);
+ }
}
+
+ private void sortVector(Vector<JMenuItem> vecteur){
+ Vector<JMenuItem> items = new Vector<JMenuItem>();
+ for(JMenuItem item : vecteur){
+ if(item.getText().equalsIgnoreCase("control the
droid")){
+ items.add(item);
+ }
+ }
+ for(JMenuItem item : vecteur){
+ if(item.getText().equalsIgnoreCase("attitunes studio")){
+ items.add(item);
+ }
+ }
+ for(JMenuItem item : vecteur){
+ if(item.getText().equalsIgnoreCase("chatter tux")){
+ items.add(item);
+ }
+ }
+ for(JMenuItem item : vecteur){
+ if(item.getText().equalsIgnoreCase("firmware updater")){
+ items.add(item);
+ }
+ }
+ this.hash = items;
+ }
+
private JMenuItem createToolMenu(String name, File tool){
JMenuItem item;
String display = name.replace("_", " ");
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
2008-08-21 13:57:36 UTC (rev 1562)
@@ -302,5 +302,42 @@
public String getPitchMenuCaption(){
return this.get("pitchMenuCaption", "Pitch setting");
+ }
+
+
+ public String getPanelAlertConfTitle(){
+ return this.get("alertConfTitle", "Time");
+ }
+
+ public String getPanelAlertSchedulConfTitle(){
+ return this.get("alertShedulConfTitle", "Alert");
+ }
+
+ public String getPanelAlertConfMins(){
+ return this.get("alertConfMins", "minutes");
+ }
+
+ public String getPanelAlertConfEvery(){
+ return this.get("alertConfEvery", "Start every");
+ }
+
+ public String getPanelAlertConfStartAt(){
+ return this.get("alertConfStartAtTime", "Start at time");
+ }
+
+ public String getPanelAlertSchedulConfTTS(){
+ return this.get("alertPanelSchedulConfTTS", "TTS Message");
+ }
+
+ public String getPanelAlertSchedulConfTTSMessages(){
+ return this.get("alertPanelSchedulConTTSMessage", "Something
changed");
+ }
+
+ public String getPanelAlertSchedulConfStartGdg(){
+ return this.get("alertPanelSchedulConStartGdg", "Start Gadget");
+ }
+
+ public String getToolMenuAdvanced(){
+ return this.get("menuToolsAdvancedItem", "Advanced");
}
}
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
2008-08-21 13:57:36 UTC (rev 1562)
@@ -8,7 +8,7 @@
menuHelpOnlineHelp=Online help
menuHelpOnlineFaq=Online FAQ
menuHelpReportBug=Report a bug
-menuHelpAbout=About...
+menuHelpAbout=About
menuViewLanguage=Interface language
menuViewSpeaker=Speak locutor
menuViewListView=List view
@@ -17,13 +17,13 @@
playlistsTitle=Live with Tux
onlineTitle=Online
libraryTitle=Library
-playlistsOptNotification=Notifications
-playlistsOptRemote=Favorites
+playlistsOptNotification=My Alerts
+playlistsOptRemote=My Favorites
panelDescription=Description
panelSummary=Summary
panelConfiguration=Configuration
panelHelp=Help
-panelAttitune=Alarm
+panelAttitune=Alert settings
gdgAttNameHeader=Name
gdgAttDescriptionHeader=Description
gdgInPlaylistHeader=In playlist
@@ -35,9 +35,9 @@
menuFilePosX=-4
menuToolPosX=80
menuViewPosX=32
-ipSelection=Select ip adress.
+ipSelection=Connect to a friend
ipSelectionEnter=Enter ip that will be used
-showDebugger=Show debugger
+showDebugger=Debugger
executionModelCommand=remote control
executionModelUI=visual
executionModelService=service
@@ -53,6 +53,15 @@
[EMAIL PROTECTED]
aboutContributorsNames =Thierry Nancy, Sebastiaan Vanpoucke.
aboutContributors=Contributors:
-pitchMenuCaptionPlus=Current: %d up to 10
-pitchMenuCaptionMinder=Current: %d down to 10
-pitchMenuCaption=Pitch setting
\ No newline at end of file
+pitchMenuCaptionPlus=Current pitch value + 10
+pitchMenuCaptionMinder=Current pitch value - 10
+pitchMenuCaption=Pitch
+alertConfTitle=Time
+alertShedulConfTitle=Alert
+alertConfMins=minutes
+alertConfEvery=Start every
+alertConfStartAtTime=Start at time
+alertPanelSchedulConfTTS=TTS message
+alertPanelSchedulConStartGdg=Start gadget
+alertPanelSchedulConTTSMessage=Something changed
+menuToolsAdvancedItem=Advanced
\ No newline at end of file
Modified:
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
===================================================================
---
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-20 16:57:53 UTC (rev 1561)
+++
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
2008-08-21 13:57:36 UTC (rev 1562)
@@ -8,7 +8,7 @@
menuHelpOnlineHelp=Aide en ligne
menuHelpOnlineFaq=FAQ en ligne
menuHelpReportBug=Reporter un bug
-menuHelpAbout=A propos...
+menuHelpAbout=A propos
menuViewLanguage=Langue du logiciel
menuViewSpeaker=Choix du locuteur
menuViewListView=Voir la vue par liste
@@ -17,13 +17,13 @@
playlistsTitle=Vivre avec Tux
onlineTitle=En ligne
libraryTitle=Librairies
-playlistsOptNotification=Notifications
-playlistsOptRemote=Mes favoris
+playlistsOptNotification=Mes Alertes
+playlistsOptRemote=Mes Favoris
panelDescription=Description
panelSummary=Sommaire
panelConfiguration=Configuration
panelHelp=Aide
-panelAttitune=Alarme
+panelAttitune=Alarme configuration
gdgAttNameHeader=Nom
gdgAttDescriptionHeader=Description
gdgInPlaylistHeader=Dans playliste
@@ -35,7 +35,7 @@
menuFilePosX=4
menuToolPosX=122
menuViewPosX=60
-ipSelection=Selection ip.
+ipSelection=Se connecter � un ami
ipSelectionEnter=Entrer l'ip � utiliser.
showDebugger=Voir le debugger
executionModelCommand=t�l�commande
@@ -53,6 +53,15 @@
[EMAIL PROTECTED]
aboutContributorsNames =Thierry Nancy, Sebastiaan Vanpoucke.
aboutContributors=Contribution:
-pitchMenuCaptionPlus=Actuel: %d : ajouter 10
-pitchMenuCaptionMinder=Actuel: %d : enlever 10
-pitchMenuCaption=Valeur du pitch
\ No newline at end of file
+pitchMenuCaptionPlus=Ton actuel + 10
+pitchMenuCaptionMinder=Ton actuel - 10
+pitchMenuCaption=Ton
+alertConfTitle=Heure
+alertShedulConfTitle=Alerte
+alertConfMins=minutes
+alertConfEvery=Toutes les
+alertConfStartAtTime=D�marrer �
+alertPanelSchedulConfTTS=message TTS
+alertPanelSchedulConStartGdg=Lancer gadget
+alertPanelSchedulConTTSMessage=Il y a du nouveau.
+menuToolsAdvancedItem=Avanc�
\ No newline at end of file
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
