From: Pierre-Luc P. <pa...@us...> - 2004-01-11 16:43:19
|
Update of /cvsroot/gallery/gallery_remote/com/gallery/GalleryRemote/util In directory sc8-pr-cvs1:/tmp/cvs-serv9465/com/gallery/GalleryRemote/util Modified Files: BrowserLink.java ImageUtils.java Log Message: 2003-01-11 Pierre-Luc Paour <ga...@pa...> (1.3-b14) * Fixed adding album into root album: extra album would appear in the GR tree. * Reverted to previous version of ImageMagick from Windows: the version 1.2 shipped with caused many problems, because it's harder to use in pseudo-installed mode. * Added support to move an album into another album, catching up to protocol support that was added a while ago by Muti. * Slideshow is functional, added preference panel to set it up. It still needs to be refined, but is complete enough for initial feedback. Index: BrowserLink.java =================================================================== RCS file: /cvsroot/gallery/gallery_remote/com/gallery/GalleryRemote/util/BrowserLink.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- BrowserLink.java 28 Dec 2003 10:14:53 -0000 1.3 +++ BrowserLink.java 11 Jan 2004 16:43:16 -0000 1.4 @@ -21,7 +21,7 @@ public BrowserLink() { super(); - setForeground(Color.BLUE); + setForeground(Color.blue); addMouseListener(this); } @@ -29,7 +29,7 @@ public BrowserLink(String url) { super(url); - setForeground(Color.BLUE); + setForeground(Color.blue); addMouseListener(this); } Index: ImageUtils.java =================================================================== RCS file: /cvsroot/gallery/gallery_remote/com/gallery/GalleryRemote/util/ImageUtils.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- ImageUtils.java 27 Dec 2003 07:52:27 -0000 1.17 +++ ImageUtils.java 11 Jan 2004 16:43:16 -0000 1.18 @@ -83,6 +83,10 @@ public static boolean deferredStopUsingJpegtran = false; public static ImageIcon load(String filename, Dimension d, int usage) { + return load(filename, d, usage, false); + } + + public static ImageIcon load(String filename, Dimension d, int usage, boolean ignoreFailure) { if (!new File(filename).exists()) { return null; } @@ -131,7 +135,7 @@ //int exitValue = exec(cmdline.toString()); int exitValue = exec((String[]) cmd.toArray(new String[0])); - if (exitValue != 0 && !imIgnoreErrorCode) { + if (exitValue != 0 && !imIgnoreErrorCode && !ignoreFailure) { if (exitValue != -1) { // don't kill IM if it's just an InterruptedException Log.log(Log.LEVEL_CRITICAL, MODULE, "ImageMagick doesn't seem to be working. Disabling"); @@ -504,6 +508,7 @@ } in.close(); + out.flush(); out.close(); su.stopProgress(StatusUpdate.LEVEL_BACKGROUND, |