Author: jerome
Date: 2008-08-22 17:04:12 +0200 (Fri, 22 Aug 2008)
New Revision: 1571

Added:
   
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Models/AttitunesModel.java
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/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/View/TuxAttitunesListView.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/Utils/AttitunesFunctions.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 attitunes categories into attitunes list view.
* Improved Settings
* Added some strings translations.
* Added some infos into attitunes description panel.
* Changed gadgets properties editor layout and colors.
*...

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/CcInterface.java
     2008-08-22 15:04:12 UTC (rev 1571)
@@ -71,12 +71,16 @@
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTable;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.border.BevelBorder;
 import javax.swing.event.PopupMenuEvent;
 import javax.swing.event.PopupMenuListener;
 import javax.swing.plaf.InsetsUIResource;
+import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableModel;
+import javax.swing.table.TableRowSorter;
 
 import org.jdesktop.jdic.tray.SystemTray;
 import org.jdesktop.jdic.tray.TrayIcon;
@@ -1723,9 +1727,6 @@
                                                                                
                                                new TuxDegradeePanel()});
                                }
                        }
-                       else{
-                               System.out.println("nowhere");
-                       }
                        
                }
                else if(this.type == CcInterface.TYPE_REMOTELIST){
@@ -1984,8 +1985,8 @@
                        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");
+               else 
if(arg0.getPropertyName().equalsIgnoreCase("Gadget-Selection-Changed")){
+                       System.out.println("vue: " + this.view);
                        Object obj = (Object)arg0.getNewValue();
                        JPanel[] readOnlyPanels = (JPanel[])obj;
                
@@ -2045,6 +2046,7 @@
                                }
                                
                                
this.currentGadgetParameters.setGadget(this.currentGadget.getGadget());
+                               
                                File iconFile = 
this.currentGadget.getGadget().getIconFile();
                                JScrollPane pane = new 
TuxDegradeeScrollPane(this.currentGadgetParameters,
                                                                                
                                        iconFile);

Added: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Models/AttitunesModel.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Models/AttitunesModel.java
                           (rev 0)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Models/AttitunesModel.java
   2008-08-22 15:04:12 UTC (rev 1571)
@@ -0,0 +1,38 @@
+/* This file is part of "TuxDroid Control Center".
+ *    Copyright 2008, kysoh
+ *    Author : Conan Jerome
+ *    eMail  : [EMAIL PROTECTED]
+ *    Site   : http://www.kysoh.com/
+ *
+ * "TuxDroid Control Center" is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "TuxDroid Control Center" 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 Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with "TuxDroid Control Center"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.tuxdroid.cc.Models;
+
+import javax.swing.table.DefaultTableModel;
+
+public class AttitunesModel  extends DefaultTableModel{
+
+       private static final long serialVersionUID = 1L;
+
+       public AttitunesModel(Object[][] values, String[] headers) {
+               super(values, headers);
+       }
+
+       public boolean isCellEditable(int rowIndex, int columnIndex) {
+               return false;
+       }
+}

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/AlertPlaylist.java
   2008-08-22 15:04:12 UTC (rev 1571)
@@ -129,7 +129,7 @@
                        //If values are attitunes datas.
                        if(obj[3].toString().endsWith(".att")){
                                for(int i=0; i < attitunesDatas.length; i++){
-                                       
if(obj[3].toString().equals(attitunesDatas[i][4])){
+                                       
if(obj[3].toString().equals(attitunesDatas[i][5])){
                                                attituneError = false;
                                                break;
                                        }
@@ -149,6 +149,7 @@
                                                }
                                        }
                                        if(gadgetError){
+                                               System.out.println("error 
checking for corruption : " + obj[0].toString());
                                                this.remove(obj);
                                        }
                                        gadgetError = true;

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/Playlist/RemotePlaylist.java
  2008-08-22 15:04:12 UTC (rev 1571)
@@ -145,7 +145,7 @@
                        //If values are attitunes datas.
                        if(obj[3].toString().endsWith(".att")){
                                for(int i=0; i < attitunesDatas.length; i++){
-                                       
if(obj[3].toString().equals(attitunesDatas[i][4])){
+                                       
if(obj[3].toString().equals(attitunesDatas[i][5])){
                                                attituneError = false;
                                                break;
                                        }

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/PseudoFileBrowser/FileBrowser.java
    2008-08-22 15:04:12 UTC (rev 1571)
@@ -30,6 +30,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 
 import javax.swing.ImageIcon;
@@ -184,19 +185,21 @@
                        }
                        //FIXME 
                        else 
if(arg0.getPropertyName().equalsIgnoreCase("Attitune-Selection-Changed")){
-                               //then update attitune description.
-                               String description = 
arg0.getNewValue().toString();
-                               
+                               //then update attitune description.
+                               Object[] obj = (Object[])arg0.getNewValue();
+                               String description = obj[0].toString();
                                this.getAttitunesDescriptionsPanel();
                                JLabel desc = new JLabel(description);
-                               desc.setIcon(new 
ImageIcon(TuxAttitunesListView.class.getResource("images/att.png")));
+                               JLabel detail = new JLabel(obj[2].toString());
+                               desc.setIcon(new ImageIcon((URL)obj[1]));
                                this.attituneDescription.add(desc);
+                               this.attituneDescription.add(detail);
                                
changes.firePropertyChange("Attitune-Selection-Changed", null,
                                                                       
this.attituneDescription);
                                
                        }
                        
-                       /** Gadgets dedicated events **/
+                       /** Gadgets dedicated events **/ //FIXME 
                        else 
if(arg0.getPropertyName().equalsIgnoreCase("new-gadget-added")){
                                Object[] obj = (Object[])arg0.getNewValue();
                                this.addGadgetDatas(obj);
@@ -383,10 +386,12 @@
                
                
                private JScrollPane createAttitunesView(){
-                       String[] column_headers = 
{language.getGdgAttNameHeader(), 
-                                                                          
language.getAttAuthorHeader(), 
+                       String[] column_headers = 
{language.getGdgAttNameHeader(),
+                                                                          
language.getAttituneCategoryCaption(),
                                                                           
language.getAttDurationHeader(), 
-                                                                          
language.getGdgAttDescriptionHeader()};
+                                                                          
language.getGdgAttDescriptionHeader(),
+                                                                          
language.getAttAuthorHeader()
+                                                                          };
                        attitunesListView = new 
TuxAttitunesListView(this.AttitunesDatas, column_headers);
                        JScrollPane scroll = attitunesListView.getTable();
                        return scroll;
@@ -753,7 +758,7 @@
                        Object[] retour = new Object[]{"", "", "", ""};
                        if(type == FileBrowser.ATTITUNES_TYPES){
                                Object[] rec = 
this.getAttitunesDatasAtSelectedIndex(view);
-                               retour = new Object[]{rec[0], "Attitune", 
rec[1], rec[4]};
+                               retour = new Object[]{rec[0], "Attitune", 
rec[4], rec[5]};
                        }
                        else if(type == FileBrowser.GADGETS_TYPE){
                                if(view == FileBrowser.LIST_VIEW){

Modified: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
        2008-08-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesListView.java
        2008-08-22 15:04:12 UTC (rev 1571)
@@ -39,6 +39,7 @@
 import java.beans.PropertyChangeSupport;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Iterator;
 
 import javax.swing.BorderFactory;
@@ -56,7 +57,9 @@
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 
+import com.tuxdroid.cc.CcInterface;
 import com.tuxdroid.cc.Listener.ColumnHeaderListener;
+import com.tuxdroid.cc.Models.AttitunesModel;
 import com.tuxdroid.cc.Models.FiltreTriModel;
 import com.tuxdroid.cc.Renderer.ColorCellRenderer;
 import com.tuxdroid.cc.Renderer.MyHeaderRenderer;
@@ -132,10 +135,10 @@
        public JTable getJTable(){
                if (jTable == null){
                        TableCellRenderer renderer = new ColorCellRenderer();
-                       DefaultTableModel model = new DefaultTableModel(values, 
headers);
+                       DefaultTableModel model = new AttitunesModel(values, 
headers);
                        FiltreTriModel sorter = new FiltreTriModel(model);
                        this.sorter = sorter;
-                       jTable = new JTable(sorter);
+                       jTable = new JTable(model);
                        sorter.addEcouteur(jTable);
                        
                        try {
@@ -175,27 +178,34 @@
                                }
                        });
                        
-                       jTable.getColumnModel().getColumn(3).setMinWidth(0);
-                       jTable.getColumnModel().getColumn(3).setMaxWidth(0);
-                       
jTable.getColumnModel().getColumn(3).setPreferredWidth(0);
+                       this.mask();
                }
                return jTable;
        }
+       
+       private void mask(){
+               jTable.getColumnModel().getColumn(3).setMinWidth(0);
+               jTable.getColumnModel().getColumn(3).setMaxWidth(0);
+               jTable.getColumnModel().getColumn(3).setPreferredWidth(0);
+               jTable.getColumnModel().getColumn(2).setMinWidth(0);
+               jTable.getColumnModel().getColumn(2).setMaxWidth(0);
+               jTable.getColumnModel().getColumn(2).setPreferredWidth(0);
+       }
        
-       
        public void update(Object[][] datas){
                this.values = datas;
-               DefaultTableModel model = new DefaultTableModel(this.values, 
headers);
+               DefaultTableModel model = new AttitunesModel(this.values, 
headers);
                this.sorter = new FiltreTriModel(model);
                jTable.setModel(this.sorter);
-               model.fireTableDataChanged();
+               model.fireTableDataChanged();
+               this.mask();
        }
        
        
        
        private int getIndexWithPath(String path){
                for(int i=0 ; i < this.values.length; i++){
-                       if(this.values[i][4].toString().equals(path)){
+                       if(this.values[i][5].toString().equals(path)){
                                return i; 
                        }
                }
@@ -230,10 +240,8 @@
                        Integer duration = Integer.valueOf(0);
                        String data = jTable.getValueAt(index, 0).toString();
                        for(Object[] dat : values){
-                               if(dat[0] == data){
-                                       for(Object val : dat){
-                                               attPath = val.toString();
-                                       }
+                               if(dat[0] == data){
+                                       attPath = dat[5].toString();
                                        duration = Integer.valueOf((String) 
dat[2]);
                                }
                        }
@@ -335,9 +343,35 @@
                
        public int getSelectedIndex(){
                return jTable.getSelectedRow();
+       }
+       
+       
+       private String getSelectedDisplayInfos(){
+               int index = this.getSelectedIndex();
+               String author = language.getAttAuthorHeader() + " : " + 
values[index][4].toString();
+               String version = language.getAttituneVersionCaption() + " : " + 
values[index][6].toString();
+               return new String(" " + version + "  , " + author);
+       }
+       
+       
+       private URL getSelectedIconURL(){
+               int index = this.getSelectedIndex();
+               if(values[index][1].toString().equalsIgnoreCase("kids")){
+                       return 
CcInterface.class.getResource("images/attitunes/kids-attitune.png");
+               }
+               else 
if(values[index][1].toString().equalsIgnoreCase("education")){
+                       return 
CcInterface.class.getResource("images/attitunes/education-attitune.png");
+               }
+               else if(values[index][1].toString().equalsIgnoreCase("fun")){
+                       return 
CcInterface.class.getResource("images/attitunes/fun-attitune.png");
+               }       
+               else if(values[index][1].toString().equalsIgnoreCase("music")){
+                       return 
CcInterface.class.getResource("images/attitunes/music-attitune.png");
+               }
+               
+               return getClass().getResource("images/att.png");
        }
        
-       
        public Object[] getDatasAtSelectedIndex(){
                int index = this.getSelectedIndex();
                return this.values[index];
@@ -439,8 +473,10 @@
        public void valueChanged(ListSelectionEvent arg0) {
                String description = null;
                try{
-                       description = this.getValueAt(3, 
this.getSelectedIndex()).toString();
-                       
changes.firePropertyChange("Attitune-Selection-Changed", null, description);
+                       description = this.getValueAt(3, 
this.getSelectedIndex()).toString();
+                       URL iconURL = this.getSelectedIconURL();
+                       String detail = this.getSelectedDisplayInfos();
+                       
changes.firePropertyChange("Attitune-Selection-Changed", null, new 
Object[]{description, iconURL, detail});
                }
                catch(Exception noObject){
                }

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Object/View/TuxAttitunesThumbnailView.java
   2008-08-22 15:04:12 UTC (rev 1571)
@@ -33,12 +33,14 @@
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Iterator;
 
 import javax.swing.BorderFactory;
 import javax.swing.JOptionPane;
 import javax.swing.JScrollPane;
 
+import com.tuxdroid.cc.CcInterface;
 import com.tuxdroid.cc.Object.Thumbnail.ThumbnailContainer;
 import com.tuxdroid.cc.UI.MyScrollBarUI;
 import com.tuxdroid.cc.Utils.languages.Languages;
@@ -71,9 +73,28 @@
                setBackground( new Color(142,142,142));
                for(int i = 0; i != modele.values.length ; i++){
                        String name = String.valueOf(modele.values[i][0]);
-                       cont.addThumb(name,  
getClass().getResource("images/att.png"), cont);
+                       cont.addThumb(name, this.getIconURL(i) , cont);
                }
                this.setViewportView(cont);
+       }
+       
+       
+       private URL getIconURL(int index){
+               
+               if(modele.values[index][1].toString().equalsIgnoreCase("kids")){
+                       return 
CcInterface.class.getResource("images/attitunes/kids-attitune.png");
+               }
+               else 
if(modele.values[index][1].toString().equalsIgnoreCase("education")){
+                       return 
CcInterface.class.getResource("images/attitunes/education-attitune.png");
+               }
+               else 
if(modele.values[index][1].toString().equalsIgnoreCase("fun")){
+                       return 
CcInterface.class.getResource("images/attitunes/fun-attitune.png");
+               }       
+               else 
if(modele.values[index][1].toString().equalsIgnoreCase("music")){
+                       return 
CcInterface.class.getResource("images/attitunes/music-attitune.png");
+               }
+               
+               return getClass().getResource("images/att.png");
        }
        
        
@@ -154,7 +175,7 @@
        private String getSelectedPath(){
                Integer index = this.getSelectedModelIndex();
                if(index.intValue() != -1){
-                       return modele.values[index.intValue()][4].toString();
+                       return modele.values[index.intValue()][5].toString();
                }
                else{ return ""; }
        }
@@ -167,6 +188,17 @@
        private Integer getSelectedAttituneDuration(){
                Integer modelIndex = this.getSelectedModelIndex().intValue();
                return Integer.valueOf(modele.values[modelIndex][2].toString());
+       }
+       
+       private String getSelectedDisplayInfos(){
+               int index = this.getSelectedModelIndex().intValue();
+               String author = language.getAttAuthorHeader() + " : " + 
modele.values[index][4].toString();
+               String version = language.getAttituneVersionCaption() + " : " + 
modele.values[index][6].toString();
+               return new String(" " + version + "  , " + author);
+       }
+       
+       private URL getSelectedIconURL(){
+               return this.getIconURL(this.getSelectedModelIndex().intValue());
        }
        
        private String getSelectedDescription(){
@@ -350,8 +382,10 @@
                }
                
                
if(arg0.getPropertyName().equalsIgnoreCase("Thumbnail-Selection-Changed")){
-                       String description = this.getSelectedDescription();
-                       this.firePropertyChange("Attitune-Selection-Changed", 
null, description);
+                       String description = this.getSelectedDescription();
+                       URL iconURL = this.getSelectedIconURL();
+                       String detail = this.getSelectedDisplayInfos();
+                       this.firePropertyChange("Attitune-Selection-Changed", 
null, new Object[]{description, iconURL, detail});
                }
                else 
if(arg0.getPropertyName().equalsIgnoreCase("double-click")){
                        this.firePropertyChange("attitune-double-click", null, 
null);

Modified: 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
===================================================================
--- 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
        2008-08-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/AttitunesFunctions.java
        2008-08-22 15:04:12 UTC (rev 1571)
@@ -44,7 +44,7 @@
                
                for (int i=0; i != AttitunesDatas.length; i++){
                        if(AttitunesDatas[i][0] == attituneName){
-                               return new 
File(String.valueOf(AttitunesDatas[i][4]));
+                               return new 
File(String.valueOf(AttitunesDatas[i][5]));
                        }
                }
                return null;
@@ -74,8 +74,9 @@
         * @return Attitunes datas as String array. (String[]).
         */
        public static String[] getAttitunesXmlDetail(File location){
-               String[] datas = new String[4];
-               datas[0] = datas[1]= datas[2] = datas[3] = "Undefined";
+               String[] datas = new String[6];
+               datas[0] = datas[1]= datas[2] = datas[3] = "Undefined";
+               datas[4] = "common";
                try{
                      if (location.exists()){
                        DocumentBuilderFactory fact = 
DocumentBuilderFactory.newInstance();
@@ -89,7 +90,11 @@
                        datas[2] = 
doc.getElementsByTagName("length").item(0).getChildNodes().item(0).getNodeValue();
                        Float value = new Float(datas[2]);
                        int val = (int) value.intValue();
-                       datas[2] = String.valueOf(val);
+                       datas[2] = String.valueOf(val);
+                       try{
+                               datas[4] = 
doc.getElementsByTagName("category").item(0).getChildNodes().item(0).getNodeValue();
+                       }catch(Exception except){}
+                       datas[5] = 
doc.getElementsByTagName("version").item(0).getChildNodes().item(0).getNodeValue();
                      }
 
                }catch(ParserConfigurationException pce){
@@ -106,7 +111,7 @@
         * @return Informations as Object [] that can be used in a table.
         */
        private static Object[] getAttituneInfo(File newAttitune, File 
ExtractPath){
-               Object[] ret = new Object[5];
+               Object[] ret = new Object[7];
                if (newAttitune.isFile()) {
                        //getting uncompresed values.
                        String name = newAttitune.getName().substring(0, 
newAttitune.getName().length() - 4);
@@ -116,12 +121,14 @@
                                try{
                                        String[] values = 
AttitunesFunctions.getAttitunesXmlDetail(uncompressed_location);
                                        ret[0] = values[1];
-                                       ret[1] = values[0];
+                                       ret[4] = values[0];
                                        ret[2] = values[2];
                                        ret[3] = values[3];
-                                       ret[4] = newAttitune.getAbsolutePath();
+                                       ret[5] = newAttitune.getAbsolutePath();
+                                       ret[1] = values[4];
+                                       ret[6] = values[5];
                                }
-                               catch(Exception except){}
+                               catch(Exception 
except){except.printStackTrace();}
                        }
                }
                return ret;
@@ -153,12 +160,13 @@
        public static Object[][] getAttitunesInfos(String[] attitunes, 
                                                                   String 
AttitunesDirectory, File ExtractPath){
                Object[][] result;
-               result = new Object[attitunes.length][5];
+               result = new Object[attitunes.length][7];
                for (int i=0; i != attitunes.length; i++){
                        //get infos.
                        File temp = new File(AttitunesDirectory + '/' + 
attitunes[i] + ".att");
                        result[i] = AttitunesFunctions.getAttituneInfo(temp, 
ExtractPath);
-               }
+               }
+               
                return result;
        }
        

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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/Languages.java
       2008-08-22 15:04:12 UTC (rev 1571)
@@ -339,5 +339,15 @@
        
        public String getToolMenuAdvanced(){
                return this.get("menuToolsAdvancedItem", "Advanced");
+       }
+       
+       
+       public String getAttituneCategoryCaption(){
+               return this.get("tableCategory", "Category");
+       }
+       
+       
+       public String getAttituneVersionCaption(){
+               return this.get("attituneVersion", "Version");
        }
 }
\ 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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_en_US.properties
      2008-08-22 15:04:12 UTC (rev 1571)
@@ -64,4 +64,6 @@
 alertPanelSchedulConfTTS=TTS message
 alertPanelSchedulConStartGdg=Start gadget
 alertPanelSchedulConTTSMessage=Something changed
-menuToolsAdvancedItem=Advanced
\ No newline at end of file
+menuToolsAdvancedItem=Advanced
+tableCategory=Category
+attituneVersion=Version
\ 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-22 10:10:38 UTC (rev 1570)
+++ 
software_suite_v2/software/control_center/trunk/control_center/sources/com/tuxdroid/cc/Utils/languages/LanguagesSet/languages_fr_FR.properties
      2008-08-22 15:04:12 UTC (rev 1571)
@@ -64,4 +64,6 @@
 alertPanelSchedulConfTTS=message TTS 
 alertPanelSchedulConStartGdg=Lancer gadget
 alertPanelSchedulConTTSMessage=Il y a du nouveau.
-menuToolsAdvancedItem=Avanc�
\ No newline at end of file
+menuToolsAdvancedItem=Avanc�
+tableCategory=Cat�gorie
+attituneVersion=Version
\ 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

Reply via email to