From b6881d9e8b1ae0f12dbeee7fcc065ac346921150 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Paour Date: Thu, 12 Feb 2004 14:47:27 +0000 Subject: [PATCH] 2004-02-11 Pierre-Luc Paour (1.3) * Fixed moving album to root of Gallery. * Changed log file name to GalleryRemoteLog.txt and updated the docs to reflect the change of name and location. Release! --- ChangeLog | 8 ++ com/gallery/GalleryRemote/Log.java | 2 +- .../GalleryRemote/MoveAlbumDialog.java | 7 +- defaults.properties | 6 +- gallery_remote.iap_xml | 80 ++++++++++--------- 5 files changed, 61 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8e743e..30389c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-02-11 Pierre-Luc Paour (1.3) + + * Fixed moving album to root of Gallery. + * Changed log file name to GalleryRemoteLog.txt and updated the + docs to reflect the change of name and location. + + Release! + 2004-02-10 Pierre-Luc Paour (1.3-b29) * Added support for flushing caches. This is useful when uploading diff --git a/com/gallery/GalleryRemote/Log.java b/com/gallery/GalleryRemote/Log.java index 0074bc6..3b861c2 100644 --- a/com/gallery/GalleryRemote/Log.java +++ b/com/gallery/GalleryRemote/Log.java @@ -169,7 +169,7 @@ public void run() { BufferedWriter writer = null; running = true; try { - writer = new BufferedWriter(new FileWriter(new File(System.getProperty("java.io.tmpdir"), "log.txt"))); + writer = new BufferedWriter(new FileWriter(new File(System.getProperty("java.io.tmpdir"), "GalleryRemoteLog.txt"))); while (running) { Thread.sleep(sleepInterval); while (!logLines.isEmpty()) { diff --git a/com/gallery/GalleryRemote/MoveAlbumDialog.java b/com/gallery/GalleryRemote/MoveAlbumDialog.java index de5fcb9..87922de 100644 --- a/com/gallery/GalleryRemote/MoveAlbumDialog.java +++ b/com/gallery/GalleryRemote/MoveAlbumDialog.java @@ -135,7 +135,12 @@ public void actionPerformed(ActionEvent e) { if (command.equals("Cancel")) { setVisible(false); } else if (command.equals("OK")) { - album.moveAlbumTo(GalleryRemote._().getCore().getMainStatusUpdate(), (Album) jAlbum.getSelectedItem()); + Album newParent = (Album) jAlbum.getSelectedItem(); + if (newParent == rootAlbum) { + newParent = null; + } + + album.moveAlbumTo(GalleryRemote._().getCore().getMainStatusUpdate(), newParent); setVisible(false); } diff --git a/defaults.properties b/defaults.properties index af253f6..ee281eb 100644 --- a/defaults.properties +++ b/defaults.properties @@ -178,6 +178,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p # # --- Do not edit below this line --- # -version=1.3-b29 -releaseDate=2004/02/10 -aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\nChris Schwerdt\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor +version=1.3 +releaseDate=2004/02/11 +aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor diff --git a/gallery_remote.iap_xml b/gallery_remote.iap_xml index cad31ab..ed23ff9 100644 --- a/gallery_remote.iap_xml +++ b/gallery_remote.iap_xml @@ -1,8 +1,8 @@ - + DATE: Wed Feb 11 11:08:04 PST 2004 --> + @@ -10,7 +10,7 @@ 12,42,11,90,81,52,54,53,54,68,86,83,81,54,80,74 3,13,71,87,105,110,100,111,119,115,32,88,80,44,32,53,46,49,44,32,120,56,54,59,32,74,97,118,97,32,49,46,51,46,49,95,48,56,44,32,83,117,110,32,77,105,99,114,111,115,121,115,116,101,109,115,32,73,110,99,46,44,32,104,116,116,112,58,47,47,106,97,118,97,46,115,117,110,46,99,111,109,47,59,32,101,110,44,32,85,83,59,32,67,112,49,50,53,50 - 1,0,0,-16,51,62,-80,80,80,112,116,103,88,98,113,97,113,65,65,88,74,65,72,71,70,69,64,69,66,69,48,79,87,5,2,4,3,88,106,9,0,0,0 + 1,0,0,-16,-93,-2,-128,32,80,112,116,103,88,98,113,97,113,65,65,88,74,65,72,71,70,69,64,69,66,69,48,79,87,5,2,9,11,90,101,10,0,0,0 @@ -179,7 +179,7 @@ it will search for ones in this list]]> - + @@ -263,7 +263,7 @@ and any path to a file to read from that file]]> - 437759 + 531993 false @@ -294,7 +294,7 @@ and any path to a file to read from that file]]> - 204076 + 92256 false @@ -964,6 +964,12 @@ and any path to a file to read from that file]]> + + + + + + @@ -1239,7 +1245,7 @@ You may cancel this installation at any time by clicking the 'Cancel' button.]]> - + true @@ -1631,7 +1637,7 @@ If the commands above do not work, you should download and install these package - + @@ -1679,7 +1685,7 @@ If the commands above do not work, you should download and install these package - + @@ -1891,7 +1897,7 @@ If the commands above do not work, you should download and install these package 1 - 2 + 3 0 @@ -1903,7 +1909,7 @@ If the commands above do not work, you should download and install these package - + @@ -1919,7 +1925,7 @@ If the commands above do not work, you should download and install these package - + @@ -2421,7 +2427,7 @@ and any path to a file to read from that file]]> - 19059 + 30154 false @@ -2450,7 +2456,7 @@ and any path to a file to read from that file]]> - 3799 + 5080 false @@ -2960,7 +2966,7 @@ and any path to a file to read from that file]]> - 7227 + 7904 false @@ -2989,7 +2995,7 @@ and any path to a file to read from that file]]> - 5274 + 6726 false @@ -3047,7 +3053,7 @@ and any path to a file to read from that file]]> - 2077 + 6605 false @@ -3076,7 +3082,7 @@ and any path to a file to read from that file]]> - 43266 + 45916 false @@ -3105,7 +3111,7 @@ and any path to a file to read from that file]]> - 5409 + 5544 false @@ -3134,7 +3140,7 @@ and any path to a file to read from that file]]> - 10344 + 10742 false @@ -3192,7 +3198,7 @@ and any path to a file to read from that file]]> - 6019 + 7505 false @@ -3342,7 +3348,7 @@ and any path to a file to read from that file]]> false - 0 + 76723 false @@ -3651,7 +3657,7 @@ and any path to a file to read from that file]]> - 126976 + 94282 false @@ -3680,7 +3686,7 @@ and any path to a file to read from that file]]> - 135168 + 172112 false @@ -3709,7 +3715,7 @@ and any path to a file to read from that file]]> - 102400 + 90192 false @@ -3738,7 +3744,7 @@ and any path to a file to read from that file]]> - 1101824 + 1138770 false @@ -3767,7 +3773,7 @@ and any path to a file to read from that file]]> - 135168 + 176207 false @@ -3796,7 +3802,7 @@ and any path to a file to read from that file]]> - 286720 + 278607 false @@ -3926,7 +3932,7 @@ and any path to a file to read from that file]]> - 19968 + 32849 false @@ -3955,7 +3961,7 @@ and any path to a file to read from that file]]> - 14336 + 32849 false @@ -3984,7 +3990,7 @@ and any path to a file to read from that file]]> - 24576 + 32850 false @@ -4013,7 +4019,7 @@ and any path to a file to read from that file]]> - 21504 + 36946 false @@ -4042,7 +4048,7 @@ and any path to a file to read from that file]]> - 94208 + 69713 false @@ -4071,7 +4077,7 @@ and any path to a file to read from that file]]> - 18944 + 32849 false @@ -4100,7 +4106,7 @@ and any path to a file to read from that file]]> - 3240 + 2647 false @@ -4486,7 +4492,7 @@ and any path to a file to read from that file]]> - 61440 + 94289 false @@ -4515,7 +4521,7 @@ and any path to a file to read from that file]]> - 45568 + 77904 false