diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/configuration/TSetup.java tico/trunk/src/tico/configuration/TSetup.java
--- tico.orig/trunk/src/tico/configuration/TSetup.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/configuration/TSetup.java 2012-09-18 09:20:55.282041127 +0200
@@ -30,6 +30,7 @@
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -55,8 +56,15 @@
* @version 1.0 Nov 20, 2006
*/
public class TSetup {
- private static String CONFIGURATION_FILE_PATH = "conf" + File.separator
- + "tico.conf";
+ // LliureX Patch
+ //private static String CONFIGURATION_FILE_PATH = "conf" + File.separator
+ // + "tico.conf";
+ public static String CONFIGURATION_FILE_PATH = System.getProperty("user.home")+ File.separator+ ".tico" + File.separator + "tico.conf";
+ public static String USER_CONFIGURATION_FILE_PATH = System.getProperty("user.home")+ File.separator+ ".tico" + File.separator + "users.xml";
+ public static String RULES_CONFIGURATION_FILE_PATH = System.getProperty("user.home")+ File.separator+ ".tico" + File.separator + "rules.xml";
+ public static String PARAMS_CONFIGURATION_FILE_PATH = System.getProperty("user.home")+ File.separator+ ".tico" + File.separator + "params_resolution.xml";
+
+ // End LliureX Patch
private static File CONFIGURATION_FILE = new File(CONFIGURATION_FILE_PATH);
@@ -66,6 +74,10 @@
private static String interpreterHomeDirectory = "";
+ // Pictos
+ private static String ArasaacPictosDir = "";
+ private static String TmpDirThumbnails = "";
+
/**
* Loads the configuration file conf/tico.conf
*
@@ -80,8 +92,35 @@
DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document doc = docBuilder.parse(CONFIGURATION_FILE);
+ // LliureX Patch
+ File f = new File(System.getProperty("user.home")+ File.separator+ ".tico");
+ f.mkdirs();
+
+ if (!CONFIGURATION_FILE.exists()) {
+
+ copyFile("/usr/local/tico/conf/tico.conf", CONFIGURATION_FILE_PATH);
+
+
+ }
+ if (!checkConfigFile("users.xml")){
+
+ copyFile("/usr/local/tico/conf/users.xml", f.getPath() + File.separator + "users.xml");
+
+ }
+
+ if (!checkConfigFile("rules.xml")) {
+
+ copyFile("/usr/local/tico/conf/rules.xml", f.getPath() + File.separator + "rules.xml");
+ }
+
+ if (!checkConfigFile("params_resolution.xml")) {
+
+ copyFile("/usr/local/tico/conf/params_resolution.xml", f.getPath() + File.separator + "params_resolution.xml");
+ }
+
+ // End LliureX Patch
+ Document doc = docBuilder.parse(CONFIGURATION_FILE);
Element preferencesElement = doc.getDocumentElement();
if (preferencesElement.getTagName().equals("preferences")) {
NodeList languageNodeList = preferencesElement.getElementsByTagName("language");
@@ -105,6 +144,28 @@
if (directoryExists(interpreterHomeDirectory))
setInterpreterHome(interpreterHomeDirectory);
}
+
+
+ // Lliurex Pictos PAtch
+ NodeList pictosDirNodeList = preferencesElement.getElementsByTagName("ArasaacPictosDir");
+ if (pictosDirNodeList.getLength() > 0) {
+ String pictosDir = pictosDirNodeList.item(0).getChildNodes().item(0).getNodeValue();
+ if (pictosDir != null)
+ if (directoryExists(pictosDir))
+ setpictosDir(pictosDir);
+ System.out.println("Pictosdir:"+pictosDir);
+ }
+ NodeList ThumbDirNodeList = preferencesElement.getElementsByTagName("TmpDirThumbnails");
+ if (ThumbDirNodeList.getLength() > 0) {
+ String ThumbDirNodeListDirectory = ThumbDirNodeList.item(0).getChildNodes().item(0).getNodeValue();
+ if (ThumbDirNodeListDirectory != null)
+ if (directoryExists(ThumbDirNodeListDirectory))
+ setpictosThumbDir(ThumbDirNodeListDirectory);
+ System.out.println("Thumbdir:"+ThumbDirNodeListDirectory);
+ }
+
+ // End LliureX Pictos Patch
+
}
}
@@ -144,6 +205,23 @@
// Append interpreter home node
projectElement.appendChild(interpreterHomeElement);
}
+
+ // LliureX Patch
+ if (!getpictosDir().equals("")){
+ Element DirArasaacElement = doc.createElement("ArasaacPictosDir");
+ DirArasaacElement.appendChild(doc.createTextNode(getpictosDir()));
+ // Append arasaac images directory node
+ projectElement.appendChild(DirArasaacElement);
+ }
+
+ if (!getpictosThumbDir().equals("")){
+ Element DirThumbElement = doc.createElement("TmpDirThumbnails");
+ DirThumbElement.appendChild(doc.createTextNode(getpictosThumbDir()));
+ // Append thumbnails dir node
+ projectElement.appendChild(DirThumbElement);
+ }
+ // End LliureX Patch
+
// Append preferences node
doc.appendChild(projectElement);
@@ -216,9 +294,58 @@
TSetup.interpreterHomeDirectory = pathInterpreter;
}
+
+ // LliureX Patch
+ public static void setpictosDir(String pictosDir) {
+ TSetup.ArasaacPictosDir = pictosDir;
+ }
+
+ public static void setpictosThumbDir(String pictosThumbDir) {
+ TSetup.TmpDirThumbnails = pictosThumbDir;
+ }
+
+ public static String getpictosDir() {
+ System.out.println("Return: "+TSetup.ArasaacPictosDir);
+ return TSetup.ArasaacPictosDir;
+ }
+
+ public static String getpictosThumbDir() {
+ System.out.println("Return: "+TSetup.TmpDirThumbnails);
+ return TSetup.TmpDirThumbnails;
+ }
+
+
+ // End LliureX Patch
+
+
+
private static boolean directoryExists(String directoryPath){
File file = new File(directoryPath);
return file.exists();
}
+ // LliureX Patch
+ private static void copyFile(String sourceFile, String destinationFile)throws IOException {
+ FileInputStream in= new FileInputStream(sourceFile);
+
+ FileOutputStream out= new FileOutputStream(destinationFile);
+ byte[] buf = new byte[1024];
+ int i=0;
+ while ((i=in.read(buf)) != -1) {
+ out.write(buf, 0, i);
+ }
+ in.close();
+ out.close();
+
+ }
+
+
+ private static boolean checkConfigFile(String nameFile) {
+ String wayFile = System.getProperty("user.home")+ File.separator+ ".tico" + File.separator+ nameFile;
+ File filename= new File(wayFile);
+ return filename.exists();
+ }
+
+ // End LliureX Patch
+
}
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/actions/TIGInsertImageAction.java tico/trunk/src/tico/imageGallery/actions/TIGInsertImageAction.java
--- tico.orig/trunk/src/tico/imageGallery/actions/TIGInsertImageAction.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/actions/TIGInsertImageAction.java 2012-09-18 09:40:50.755969155 +0200
@@ -100,7 +100,6 @@
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
public void actionPerformed(ActionEvent e) {
-
if (path.compareTo("") != 0){
imageName = (path.substring(path.lastIndexOf(File.separator) + 1, path.length()));
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/components/TIGThumbImage.java tico/trunk/src/tico/imageGallery/components/TIGThumbImage.java
--- tico.orig/trunk/src/tico/imageGallery/components/TIGThumbImage.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/components/TIGThumbImage.java 2012-09-18 09:34:20.114032077 +0200
@@ -27,6 +27,18 @@
package tico.imageGallery.components;
+import tico.configuration.*;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Vector;
+
+import tico.configuration.TSetup;
import java.awt.image.BufferedImage;
import java.awt.Color;
import java.awt.Dimension;
@@ -60,7 +72,11 @@
protected JLabel createImageLabel(String image_path){
if (image_path != null){
- String path = "images" + File.separator + image_path.substring(0,1).toUpperCase()
+ /* JA PATCH*/
+ /*String path = "images" + File.separator + image_path.substring(0,1).toUpperCase()
+ + File.separator + image_path;*/
+
+ String path = TSetup.getpictosThumbDir() + File.separator + image_path.substring(0,1).toUpperCase()
+ File.separator + image_path;
File image = new File(path);
setImageFile(image);
@@ -73,6 +89,10 @@
}
private void setImageFile(File imageFile) {
+ /* JA Patch */
+ System.out.println("ImageFile val: "+imageFile);
+
+
// Temporal image
image = null;
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/components/TIGThumbnails.java tico/trunk/src/tico/imageGallery/components/TIGThumbnails.java
--- tico.orig/trunk/src/tico/imageGallery/components/TIGThumbnails.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/components/TIGThumbnails.java 2012-09-18 09:43:40.928812995 +0200
@@ -27,6 +27,8 @@
package tico.imageGallery.components;
+import tico.configuration.*;
+
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics2D;
@@ -214,11 +216,27 @@
pathImage[i] = (String)data.elementAt(0);
thumbName = pathImage[i].substring(0, pathImage[i].lastIndexOf('.')) + "_th.jpg";
+
+
+ /*JA Patch*/
+ /*
pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[i].substring(0,1).toUpperCase() + File.separator + pathImage[i];
-
+ System.out.println("***************** pathSrc"+ pathSrc);
+ System.out.println(">>>>>>> pathimage[i]"+ pathImage[i]);
pathTh = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[i].substring(0,1).toUpperCase() + File.separator + thumbName;
+ System.out.println("***************** pathTh"+ pathTh);*/
+
+ pathSrc = TSetup.getpictosDir() +
+ pathImage[i].substring(0,1).toUpperCase() + File.separator + pathImage[i];
+ pathTh = TSetup.getpictosThumbDir() +
+ pathImage[i].substring(0,1).toUpperCase() + File.separator + thumbName;
+
+ System.out.println("*****pathSrc: "+pathSrc);
+ System.out.println("*****pathTh: "+pathTh);
+
+ /*End JA Patch*/
createThumbnail(pathSrc, pathTh);
@@ -335,11 +353,21 @@
pathImage[i] = (String)data.elementAt(0);
thumbName = pathImage[i].substring(0, pathImage[i].lastIndexOf('.')) + "_th.jpg";
- pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
+ /* JA Patch*/
+ /* pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[i].substring(0,1).toUpperCase() + File.separator + pathImage[i];
pathTh = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[i].substring(0,1).toUpperCase() + File.separator + thumbName;
+ */
+
+ pathSrc = TSetup.getpictosDir() +
+ pathImage[i].substring(0,1).toUpperCase() + File.separator + pathImage[i];
+ pathTh = TSetup.getpictosThumbDir() +
+ pathImage[i].substring(0,1).toUpperCase() + File.separator + thumbName;
+
+ /*End JA Patch*/
+
createThumbnail(pathSrc, pathTh);
@@ -381,11 +409,19 @@
pathImage[indexThumb] = (String)data.elementAt(0);
thumbName = pathImage[indexThumb].substring(0, pathImage[indexThumb].lastIndexOf('.')) + "_th.jpg";
- pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
+ /* JA Patch */
+ /*pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + pathImage[indexThumb];
pathTh = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + thumbName;
+ */
+ pathSrc = TSetup.getpictosDir() +
+ pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + pathImage[indexThumb];
+ pathTh = TSetup.getpictosThumbDir() +
+ pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + thumbName;
+
+ /*End JA Patch*/
createThumbnail(pathSrc, pathTh);
@@ -408,11 +444,20 @@
pathImage[indexThumb] = (String)data.elementAt(0);
thumbName = pathImage[indexThumb].substring(0, pathImage[indexThumb].lastIndexOf('.')) + "_th.jpg";
- pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
+ /* JA Patch*/
+ /* pathSrc = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + pathImage[indexThumb];
pathTh = System.getProperty("user.dir") + File.separator + "images" + File.separator +
pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + thumbName;
+ */
+ pathSrc = TSetup.getpictosDir() +
+ pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + pathImage[indexThumb];
+ pathTh = TSetup.getpictosThumbDir() +
+ pathImage[indexThumb].substring(0,1).toUpperCase() + File.separator + thumbName;
+
+ /*End JA Patch*/
+
createThumbnail(pathSrc,pathTh);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/dataBase/TIGDataBase.java tico/trunk/src/tico/imageGallery/dataBase/TIGDataBase.java
--- tico.orig/trunk/src/tico/imageGallery/dataBase/TIGDataBase.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/dataBase/TIGDataBase.java 2012-09-17 14:24:24.169651053 +0200
@@ -26,6 +26,7 @@
*/
package tico.imageGallery.dataBase;
+import tico.configuration.*;
import java.io.File;
import java.sql.Connection;
@@ -36,6 +37,8 @@
import java.sql.Statement;
import java.util.Vector;
+import tico.configuration.TSetup;
+
// TODO: Auto-generated Javadoc
/**
* Database for the images in the gallery.
@@ -60,7 +63,8 @@
/**
* The file name.
*/
- private static String fileName = "images" + File.separator + "images.db";
+ //private static String fileName = "images" + File.separator + "images.db"; /* JA Patch */
+ private static String fileName = TSetup.getpictosDir()+"/images.db"; /* JA Patch */
//Data base connection
/**
* The conn.
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/dialogs/TIGImageGalleryDialog.java tico/trunk/src/tico/imageGallery/dialogs/TIGImageGalleryDialog.java
--- tico.orig/trunk/src/tico/imageGallery/dialogs/TIGImageGalleryDialog.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/dialogs/TIGImageGalleryDialog.java 2012-09-11 11:57:23.887381089 +0200
@@ -236,7 +236,8 @@
}
public String pathImageSelected(){
- return "images" + File.separator + pathImageSelected.substring(0,1).toUpperCase() + File.separator + pathImageSelected;
+ /* JA Patch */ return "/var/lib/arasaac-pictos" + File.separator + pathImageSelected.substring(0,1).toUpperCase() + File.separator + pathImageSelected;
+ ///* JA Patch */ return "images" + File.separator + pathImageSelected.substring(0,1).toUpperCase() + File.separator + pathImageSelected;
}
/**
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/imageGallery/TImageGalleryButton.java tico/trunk/src/tico/imageGallery/TImageGalleryButton.java
--- tico.orig/trunk/src/tico/imageGallery/TImageGalleryButton.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/imageGallery/TImageGalleryButton.java 2012-09-18 09:53:04.827609220 +0200
@@ -88,12 +88,24 @@
// Import the file to the application directory
if (imageGallery.isImageSelected()){
File selectedFile = new File(imageGallery.pathImageSelected());
- path = System.getProperty("user.dir")+File.separator+imageGallery.pathImageSelected();
+
+
+ //System.out.println("000!: "+ imageGallery.pathImageSelected());
+
+
+ try{
+ //System.out.println("11111111!: "+ selectedFile.getCanonicalFile());
+ //System.out.println("22222222!: "+ selectedFile.getCanonicalPath());
+ }catch (Exception ex) {}
+
+ /* JA Patch */ //path = System.getProperty("user.dir")+File.separator+imageGallery.pathImageSelected();
+ /* JA Patch */ path = "/var/lib/arasaac-pictos";
indexImageSelected = imageGallery.indexImageSelected();
try {
selectedFile = TFileHandler.importFile(selectedFile);
} catch (Exception ex) {
// If the import fails show an error message
+
JOptionPane.showMessageDialog(null,
TLanguage.getString("TImageChooser.CHOOSE_IMAGE_ERROR"),
TLanguage.getString("ERROR")+"!",
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml 2012-09-10 12:57:22.893211422 +0200
@@ -0,0 +1,10 @@
+
+
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml 2012-09-10 12:57:22.889211404 +0200
@@ -0,0 +1,2 @@
+
+
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml 2012-09-10 12:57:22.889211404 +0200
@@ -0,0 +1,2 @@
+
+
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml 2012-09-10 12:57:22.993211907 +0200
@@ -0,0 +1,3 @@
+
+
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml 2012-09-10 12:57:22.517209558 +0200
@@ -0,0 +1,217 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No hay ningún carácter de nueva línea al final del archivo
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
--- tico.orig/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml 1970-01-01 01:00:00.000000000 +0100
+++ tico/trunk/src/tico/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml 2012-09-10 12:57:11.397154417 +0200
@@ -0,0 +1,4 @@
+
+
+
+
\ No hay ningún carácter de nueva línea al final del archivo
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TDeleteLimitation.java tico/trunk/src/tico/rules/database/TDeleteLimitation.java
--- tico.orig/trunk/src/tico/rules/database/TDeleteLimitation.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TDeleteLimitation.java 2012-09-17 11:53:09.824653805 +0200
@@ -26,6 +26,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.awt.Dimension;
import java.awt.Toolkit;
import java.io.File;
@@ -49,8 +51,11 @@
public class TDeleteLimitation {
// The XML file
- private static String PARAMS_FILE_PATH = "conf" + File.separator
- + "params_resolution.xml";
+ // LliureX Patch
+ // private static String PARAMS_FILE_PATH = "conf" + File.separator
+ //+ "params_resolution.xml";
+ // End LLiureX Patch
+ private static String PARAMS_FILE_PATH = TSetup.PARAMS_CONFIGURATION_FILE_PATH;
private static File PARAMS_FILE = new File(PARAMS_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TDeleteRule.java tico/trunk/src/tico/rules/database/TDeleteRule.java
--- tico.orig/trunk/src/tico/rules/database/TDeleteRule.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TDeleteRule.java 2012-09-17 12:12:01.586265912 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -48,7 +50,10 @@
public class TDeleteRule {
// The XML file
- private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ // LliureX Patch
+ // private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ private static String RULES_FILE_PATH = TSetup.RULES_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File RULES_FILE = new File(RULES_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TDeleteUser.java tico/trunk/src/tico/rules/database/TDeleteUser.java
--- tico.orig/trunk/src/tico/rules/database/TDeleteUser.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TDeleteUser.java 2012-09-17 12:03:05.619608212 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -48,7 +50,10 @@
public class TDeleteUser {
// The XML file
- private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ // LliureX Patch
+ //private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ private static String USERS_FILE_PATH = TSetup.USER_CONFIGURATION_FILE_PATH;
+ //End LliureX Patch
private static File USERS_FILE = new File(USERS_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TLoadLimitation.java tico/trunk/src/tico/rules/database/TLoadLimitation.java
--- tico.orig/trunk/src/tico/rules/database/TLoadLimitation.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TLoadLimitation.java 2012-09-17 12:06:22.656585254 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.awt.*;
import java.io.File;
import java.io.IOException;
@@ -51,8 +53,11 @@
public class TLoadLimitation {
// The XML file
- private static String PARAMS_FILE_PATH = "conf" + File.separator
- + "params_resolution.xml";
+ // LliureX Patch
+ //private static String PARAMS_FILE_PATH = "conf" + File.separator
+ // + "params_resolution.xml";
+ private static String PARAMS_FILE_PATH = TSetup.PARAMS_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File PARAMS_FILE = new File(PARAMS_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TLoadParameter.java tico/trunk/src/tico/rules/database/TLoadParameter.java
--- tico.orig/trunk/src/tico/rules/database/TLoadParameter.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TLoadParameter.java 2012-09-17 11:57:51.258049345 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.awt.*;
import java.io.File;
import java.io.IOException;
@@ -51,8 +53,10 @@
public class TLoadParameter {
- private static String PARAMS_FILE_PATH = "conf" + File.separator
- + "params_resolution.xml";
+ //LliureX Patch private static String PARAMS_FILE_PATH = "conf" + File.separator
+ // + "params_resolution.xml";
+ private static String PARAMS_FILE_PATH = TSetup.PARAMS_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File PARAMS_FILE = new File(PARAMS_FILE_PATH);
// List of limitations with all its values
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TLoadRule.java tico/trunk/src/tico/rules/database/TLoadRule.java
--- tico.orig/trunk/src/tico/rules/database/TLoadRule.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TLoadRule.java 2012-09-17 12:05:06.320206713 +0200
@@ -26,6 +26,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.IOException;
import java.util.*;
@@ -48,7 +50,10 @@
public class TLoadRule {
// The XML file
- private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ // LliureX Patch
+ //private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ private static String RULES_FILE_PATH = TSetup.RULES_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File RULES_FILE = new File(RULES_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TLoadUser.java tico/trunk/src/tico/rules/database/TLoadUser.java
--- tico.orig/trunk/src/tico/rules/database/TLoadUser.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TLoadUser.java 2012-09-17 11:56:30.213647484 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.IOException;
import java.util.*;
@@ -48,7 +50,10 @@
public class TLoadUser {
// The XML file
- private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ // LliureX Patch
+ //private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ private static String USERS_FILE_PATH = TSetup.USER_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File USERS_FILE = new File(USERS_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TSaveRule.java tico/trunk/src/tico/rules/database/TSaveRule.java
--- tico.orig/trunk/src/tico/rules/database/TSaveRule.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TSaveRule.java 2012-09-17 12:04:05.687906051 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -49,7 +51,10 @@
public class TSaveRule {
// The XML file
- private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ // LliureX Patch
+ //private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ private static String RULES_FILE_PATH = TSetup.RULES_CONFIGURATION_FILE_PATH;
+ // Emd LliureX Patch
private static File RULES_FILE = new File(RULES_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/database/TSaveUser.java tico/trunk/src/tico/rules/database/TSaveUser.java
--- tico.orig/trunk/src/tico/rules/database/TSaveUser.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/database/TSaveUser.java 2012-09-17 11:55:00.401202123 +0200
@@ -27,6 +27,8 @@
package tico.rules.database;
+import tico.configuration.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -49,7 +51,10 @@
public class TSaveUser {
// The XML file
- private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ // LliureX Patch
+ //private static String USERS_FILE_PATH = "conf" + File.separator + "users.xml";
+ private static String USERS_FILE_PATH = TSetup.USER_CONFIGURATION_FILE_PATH;
+ // End LliureX Patch
private static File USERS_FILE = new File(USERS_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/dialogs/TLimitationsAdminDialog.java tico/trunk/src/tico/rules/dialogs/TLimitationsAdminDialog.java
--- tico.orig/trunk/src/tico/rules/dialogs/TLimitationsAdminDialog.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/dialogs/TLimitationsAdminDialog.java 2012-09-17 12:03:16.367661494 +0200
@@ -72,7 +72,8 @@
import tico.components.TButton;
import tico.components.TComboBox;
import tico.components.TDialog;
-import tico.configuration.TLanguage;
+// LliureX Patch import tico.configuration.TLanguage;
+import tico.configuration.*;
import tico.editor.TEditor;
import tico.rules.TAttribute;
import tico.rules.TLimitation;
@@ -94,8 +95,11 @@
*/
private static int MAX_LIMITATIONS = 8;
- private static String PARAMS_FILE_PATH = "conf" + File.separator
- + "params_resolution.xml";
+ // LliureX Patch
+ // private static String PARAMS_FILE_PATH = "conf" + File.separator
+ //+ "params_resolution.xml";
+ // End LliureX Patch
+ private static String PARAMS_FILE_PATH = TSetup.PARAMS_CONFIGURATION_FILE_PATH;
private static File PARAMS_FILE = new File(PARAMS_FILE_PATH);
private static String DEFAULT_PARAMS_FILE_PATH = "conf" + File.separator
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/rules/dialogs/TRulesAdminDialog.java tico/trunk/src/tico/rules/dialogs/TRulesAdminDialog.java
--- tico.orig/trunk/src/tico/rules/dialogs/TRulesAdminDialog.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/rules/dialogs/TRulesAdminDialog.java 2012-09-17 11:47:22.690932469 +0200
@@ -84,7 +84,8 @@
* @param editor The specified editor
*/
- private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ // LliureX Patch // private static String RULES_FILE_PATH = "conf" + File.separator + "rules.xml";
+ private static String RULES_FILE_PATH = TSetup.RULES_CONFIGURATION_FILE_PATH;
private static File RULES_FILE = new File(RULES_FILE_PATH);
private static String DEFAULT_RULES_FILE_PATH = "conf" + File.separator + "default_rules.xml";
private static File DEFAULT_RULES_FILE = new File(DEFAULT_RULES_FILE_PATH);
diff -BbNuar -x '*.svn' -X exclude.pat tico.orig/trunk/src/tico/TLauncher.java tico/trunk/src/tico/TLauncher.java
--- tico.orig/trunk/src/tico/TLauncher.java 2012-06-18 12:30:49.805218000 +0200
+++ tico/trunk/src/tico/TLauncher.java 2012-09-18 09:03:56.168987619 +0200
@@ -31,6 +31,7 @@
import java.io.IOException;
import javax.swing.JOptionPane;
+import javax.swing.UIManager;
import javax.xml.parsers.ParserConfigurationException;
import org.xml.sax.SAXException;
@@ -65,8 +66,36 @@
*/
static File selectedFile;
public static void main(String[] args) {
+
+ /* JA Patch */
+ // Apanyos inicials
+ // 1. Posem la interfíce per GTK
+
+ try {
+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
+ } catch (Exception e) {
+ System.out.println("Exception: "+e.getMessage());
+ }
+
+ // 2. Creem l'estructura de directoris en /tmp per als thumbnails
+ new File("/tmp/arasaac-pictos").mkdir();
+ new File("/tmp/arasaac-pictos/0").mkdir();
+ new File("/tmp/arasaac-pictos/1").mkdir();
+ new File("/tmp/arasaac-pictos/2").mkdir();
+ new File("/tmp/arasaac-pictos/3").mkdir();
+ new File("/tmp/arasaac-pictos/4").mkdir();
+ new File("/tmp/arasaac-pictos/5").mkdir();
+ new File("/tmp/arasaac-pictos/6").mkdir();
+ new File("/tmp/arasaac-pictos/7").mkdir();
+ new File("/tmp/arasaac-pictos/8").mkdir();
+ new File("/tmp/arasaac-pictos/9").mkdir();
+
+ /* End JA Patch*/
+
+
// Loads application setup
try {
+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
TSetup.load();
} catch (Exception e) {
// If the configuration file fails show the message error