Commit 0a28a8e6 authored by Daniel Dreibrodt's avatar Daniel Dreibrodt

Warn of bitmap load errors

Build jar into root directory, so for testing purposes one can directly execute it from there and needn't copy it
parent ea188daa
......@@ -35,7 +35,7 @@
</target>
<target name="jar" depends="compile, copy-resources">
<jar destfile="${build}/VLCSkinEditor.jar">
<jar destfile="VLCSkinEditor.jar">
<fileset dir="${build}/classes" />
<fileset dir="${build}/resources" />
<manifest>
......@@ -52,11 +52,11 @@
<target name="package-update" depends="jar">
<echo file=".updated" />
<zip destfile="${dist}/VLCSkinEditor_update.zip">
<fileset dir="${build}/" includes="VLCSkinEditor.jar" />
<zip destfile="${dist}/VLCSkinEditor_update.zip">
<fileset dir="${share}/" includes="VLCSkinEditor.exe
ICE_JNIRegistry.dll" />
<fileset dir="." includes=".updated
VLCSkinEditor.jar
README.TXT
LICENSE.TXT
${lang}/*.txt
......@@ -66,12 +66,12 @@
</target>
<target name="package-win32" depends="jar">
<zip destfile="${dist}/VLCSkinEditor_w32.zip">
<fileset dir="${build}/" includes="VLCSkinEditor.jar"/>
<zip destfile="${dist}/VLCSkinEditor_w32.zip">
<fileset dir="${share}/" includes="VLCSkinEditor.exe
ICE_JNIRegistry.dll" />
<fileset dir="." includes="README.TXT
LICENSE.TXT
VLCSkinEditor.jar
${lang}/*.txt
${lang}/*/*.txt"/>
</zip>
......@@ -98,11 +98,11 @@
</target>
<target name="package-unix" depends="jar">
<tar destfile="${dist}/VLCSkinEditor_unix.tar">
<fileset dir="${build}/" includes="VLCSkinEditor.jar" />
<tar destfile="${dist}/VLCSkinEditor_unix.tar">
<fileset dir="${share}/" includes="VLCSkinEditor" />
<fileset dir="." includes="README.TXT
LICENSE.TXT
LICENSE.TXT
VLCSkinEditor.jar
${lang}/*.txt
${lang}/*/*.txt" />
</tar>
......
......@@ -121,6 +121,8 @@ ERROR_OUTSIDE_TITLE|Dimensions not valid
ERROR_OUTSIDE_MSG|Specified dimensions are outside the parent bitmap!
ERROR_BITMAP_NEXIST|The bitmap %i does not exist.
ERROR_BITMAP_NEXIST_TITLE|Image not valid!
ERROR_BITMAP_LOAD|The image file for the bitmap %i could not be loaded.
ERROR_BITMAP_LOAD_TITLE|Error while loading images
#Other strings
THEMEINFO_NAME_DEFAULT|Unnamed Theme
......
......@@ -178,7 +178,7 @@ public class Bitmap extends ImageResource implements ActionListener{
}
catch(Exception ex) {
ex.printStackTrace();
//JOptionPane.showMessageDialog(null,ex.getMessage()+"\n"+s.skinfolder+file,"Bitmap \""+id+"\" caused an error",JOptionPane.ERROR_MESSAGE);
JOptionPane.showMessageDialog(null,Language.get("ERROR_BITMAP_LOAD").replaceAll("%i",id),Language.get("ERROR_BITMAP_LOAD_TITLE"),JOptionPane.ERROR_MESSAGE);
//showOptions();
image = new BufferedImage(32,32,BufferedImage.TYPE_INT_ARGB);
Graphics2D g = (Graphics2D)image.getGraphics();
......
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