Commit d390b220 authored by Daniel Dreibrodt's avatar Daniel Dreibrodt

Critical bugfix of PreviewWindow. Bugfixes of XML parsing, especially in Slider.

parent fe063c2e
VLC Skin Editor release 0.6.0a
VLC Skin Editor release 0.6.1b
-----------------------------------------------------------
Changelog:
-----------------------------------------------------------
0.6.1b - Critical bufix for the Preview Window
- Bugfix for slider points parsing and XML parsing
0.6.0a - Resources/windows/layouts/items can be edited by
doubleclicking on them in the hiearchy trees
- Sliders are rendered completely as in VLC
......
......@@ -47,7 +47,7 @@ import vlcskineditor.history.*;
public class Main extends javax.swing.JFrame implements ActionListener, TreeSelectionListener, WindowListener, MouseListener{
//The version identification of the current build.
public final String VERSION = "0.7.0.a";
public final String VERSION = "0.6.1.b";
//The directory in which the VLC executable is found
String vlc_dir = "";
//The directory from which VLC loads its skins
......@@ -1076,7 +1076,7 @@ public class Main extends javax.swing.JFrame implements ActionListener, TreeSele
JOptionPane.YES_NO_OPTION,JOptionPane.QUESTION_MESSAGE,null,options,options[1]);
if(n==0) {
LayoutDeletionEvent lde = new LayoutDeletionEvent(w, l, w.layouts.indexOf(l), s);
pvwin.clearLayout();
pvwin.clearLayout();
w.layouts.remove(l);
s.updateWindows();
s.updateItems();
......@@ -1295,14 +1295,7 @@ public class Main extends javax.swing.JFrame implements ActionListener, TreeSele
selected_layout = path[i].toString().substring(path[i].toString().indexOf(": ")+2);
pvwin.setLayout(s.getWindow(selected_window),s.getWindow(selected_window).getLayout(selected_layout));
s.updateItems();
}
else {
selected_window = null;
selected_layout = null;
pvwin.clearLayout();
pvwin.setVisible(false);
s.updateItems();
}
}
}
}
else if(e.getSource().equals(items_tree)) {
......
......@@ -45,7 +45,7 @@ public class XML {
public static int getIntValue(String line, String field) {
int i = 0;
try {
i = Integer.parseInt(getValue(line,field));
i = Integer.parseInt(getValue(line,field).trim());
}
catch (Exception e) {
System.out.println("Could not parse int from getValue("+line+","+field+"): "+getValue(line,field));
......@@ -55,7 +55,7 @@ public class XML {
public static boolean getBoolValue(String line, String field) {
boolean b = false;
try {
b = Boolean.parseBoolean(getValue(line,field));
b = Boolean.parseBoolean(getValue(line,field).trim());
}
catch (Exception e) {
System.out.println("Could not parse boolean from getValue("+line+","+field+"): "+getValue(line,field));
......
......@@ -157,8 +157,8 @@ public class Slider extends Item implements ActionListener{
for(int i=0;i<pnts.length;i++) {
String pnt = pnts[i];
String[] coords = pnt.split(",");
xpos[i] = Integer.parseInt(coords[0].replaceAll("\\(",""));
ypos[i] = Integer.parseInt(coords[1].replaceAll("\\)",""));
xpos[i] = Integer.parseInt(coords[0].replaceAll("\\(","").trim());
ypos[i] = Integer.parseInt(coords[1].replaceAll("\\)","").trim());
}
b = new Bezier(xpos,ypos,Bezier.kCoordsBoth);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment