2003-01-26 Pierre-Luc Paour <gallery@paour.com> (1.3-b22)

	* Fixed slideshow causing exception on platforms capable
	  of using full-screen but where some manager decides to forbid
	  it...
	* Add pictures dialog now allows users to select whole folders
	  (thanks Terje).
	* AppletMini no longer downloads the list of albums (faster).

ChangeLog

@@ -1,3 +1,12 @@
+2003-01-26  Pierre-Luc Paour <gallery@paour.com> (1.3-b22)
+
+	* Fixed slideshow causing exception on platforms capable
+	  of using full-screen but where some manager decides to forbid
+	  it...
+	* Add pictures dialog now allows users to select whole folders
+	  (thanks Terje).
+	* AppletMini no longer downloads the list of albums (faster).
+
 2003-01-23  Pierre-Luc Paour <gallery@paour.com> (1.3-b21)
 
 	* More refactoring to improve startup sequence for the applets.

com/gallery/GalleryRemote/AddFileDialog.java

@@ -33,7 +33,7 @@ static File[] addFiles(Component parent) {
 		JFileChooser fc = new JFileChooser();
 
 		fc.addChoosableFileFilter(new GalleryFileFilter());
-		fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
+		fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
 		fc.setMultiSelectionEnabled(true);
 
 		File currentDirectory = GalleryRemote._().properties.getCurrentDirectory();

com/gallery/GalleryRemote/GRAppletMini.java

@@ -63,12 +63,15 @@ public void startup() {
 
 		galleries.addElement(gallery);
 
-		gallery.fetchAlbums(getMainStatusUpdate(), false);
+		//gallery.fetchAlbums(getMainStatusUpdate(), false);
 
-		album = gallery.getAlbumByName(info.albumName);
+		//album = gallery.getAlbumByName(info.albumName);
 
 		ImageUtils.deferredTasks();
 
+		album = new Album(gallery);
+		album.setName(info.albumName);
+
 		jPicturesList.setModel(album);
 		jPicturesList.setInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT, null);
 		jPicturesList.setInputMap(JComponent.WHEN_FOCUSED, null);

com/gallery/GalleryRemote/SlideshowFrame.java

@@ -60,7 +60,7 @@ public SlideshowFrame() {
 			//DialogUtil.maxSize(this);
 			//setBounds(600, 100, 500, 500);
 			//show();
-		} catch (NoSuchMethodError e) {
+		} catch (Throwable e) {
 			Log.log(Log.LEVEL_TRACE, MODULE, "No full-screen mode: using maximized window");
 			DialogUtil.maxSize(this);
 			show();

com/gallery/GalleryRemote/model/Album.java

@@ -29,6 +29,7 @@
 import java.awt.*;
 import java.io.File;
 import java.io.Serializable;
+import java.io.IOException;
 import java.util.*;
 import java.util.List;
 
@@ -237,10 +238,19 @@ public ArrayList addPictures(File[] files) {
 	 * @param index the index in the list at which to begin adding
 	 */
 	public ArrayList addPictures(File[] files, int index) {
-		ArrayList pictures = new ArrayList(files.length);
+		List expandedFiles = Arrays.asList(files);
+		try {
+			expandedFiles = ImageUtils.expandDirectories(Arrays.asList(files));
+		} catch (IOException e) {
+			Log.logException(Log.LEVEL_ERROR, MODULE, e);
+		}
+
+		ArrayList pictures = new ArrayList(expandedFiles.size());
+
+		for (Iterator it = expandedFiles.iterator(); it.hasNext();) {
+			File f = (File) it.next();
 
-		for (int i = 0; i < files.length; i++) {
-			Picture p = new Picture(files[i]);
+			Picture p = new Picture(f);
 			p.setAlbum(this);
 			if (index == -1) {
 				addPictureInternal(p);

com/gallery/GalleryRemote/resources/GRResources.properties

@@ -7,7 +7,7 @@ MainFrame.statusBarSel = Selected {0, number, integer} {1} / {2, number, integer
 MainFrame.oneSel = picture
 MainFrame.manySel = pictures
 MainFrame.noSelection = No selection
-MainFrame.selPicToAdd = Select pictures to add to the list
+MainFrame.selPicToAdd = Select pictures and/or whole folders to add to the list
 MainFrame.Gallery_URL = Gallery URL
 MainFrame.Select_Album = Select Album
 MainFrame.loginButtonTip = Connect or disconnect from the selected Gallery. You can be connected to more than one Gallery simultaneously.
@@ -236,7 +236,7 @@ About.title = About Gallery Remote
 About.aboutAnim = About box animation thread
 
 #AddFileDialog module
-AddFileDialog.Add = Add
+AddFileDialog.Add = Add pictures and/or whole folders
 
 
 #AuthorizePopup module
@@ -327,7 +327,7 @@ GalComm2.crateAlbmOk = Create album successful.
 GalComm2.trnsfrStat = Transferring {0} / {1}kB ({2}kB/s)
 GalComm2.upCompSrvrProc = Upload completed: server processing...
 GalComm2.fetchAlbImages = Getting the list of images from album {0}
-GalComm2.fetchAlbImagesDone = Received {0} images descriptions from server.
+GalComm2.fetchAlbImagesDone = Received {0} images descriptions.
 GalComm2.moveAlbum = Moving album {0} to {1}
 GalComm2.moveAlbumDone = Album successfully moved
 GalComm2.rootAlbum = root album
@@ -441,7 +441,7 @@ UploadProgress.upImgNM = Uploading image n of m
 UploadProgress.upImgGif = Uploading img.gif
 UploadProgress.Cancel = Cancel
 UploadProgress.shutDownTip = Shut down the computer when the transfer completes
-UploadProgress.shutDown = Shutdown when done
+UploadProgress.shutDown = Shutdown computer when done
 UploadProgress.Error = Error
 
 

defaults.properties

@@ -168,6 +168,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.3-b21
-releaseDate=2004/01/23
+version=1.3-b22
+releaseDate=2004/01/26
 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\nAmedeo Paglione\nChris Schwerdt\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\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