2004-02-12 Pierre-Luc Paour <gallery@paour.com> (1.3.1-b3)

* Slideshow button is disabled when ther are no pictures to show. * This is also the case in the slideshow applet, and an alert is displayed.
gallery · Feb 12, 2004 · 8c3a645 · 8c3a645
1 parent 9add451
commit 8c3a645
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,10 +1,16 @@
+2004-02-12  Pierre-Luc Paour <gallery@paour.com> (1.3.1-b3)
+
+	* Slideshow button is disabled when ther are no pictures to show.
+	* This is also the case in the slideshow applet, and an alert is
+	  displayed.
+
 2004-02-12  Pierre-Luc Paour <gallery@paour.com> (1.3.1-b2)
 
 	* Fixed slideshow on the Mac (the top of the image was
 	  obscured by the menu bar). I can't figure out why the Mac VM
 	  will not go into full-screen mode...
 	* Fixed a potential VM killer bug with going into slideshow
-	  mode.
+	  mode. This was a Safari-crashing bug on Mac.
 
 2004-02-12  Pierre-Luc Paour <gallery@paour.com> (1.3.1-b1)
 

diff --git a/com/gallery/GalleryRemote/AlbumInspector.java b/com/gallery/GalleryRemote/AlbumInspector.java
@@ -357,6 +357,8 @@ public void setAlbum(Album album) {
 
 			jFetch.setEnabled(album.getGallery().getComm(mf.jStatusBar).hasCapability(mf.jStatusBar, GalleryCommCapabilities.CAPA_FETCH_ALBUM_IMAGES));
 			jMove.setEnabled(album.getGallery().getComm(mf.jStatusBar).hasCapability(mf.jStatusBar, GalleryCommCapabilities.CAPA_MOVE_ALBUM));
+
+			jSlideshow.setEnabled(album.getSize() > 0);
 		}
 
 		// todo: protocol support

diff --git a/com/gallery/GalleryRemote/GRAppletSlideshow.java b/com/gallery/GalleryRemote/GRAppletSlideshow.java
@@ -90,7 +90,7 @@ protected void jbInit() {
 	}
 
 	public void setInProgress(boolean inProgress) {
-		jStart.setEnabled(!inProgress);
+		jStart.setEnabled(!inProgress && album.getSize() > 0);
 
 		this.inProgress = inProgress;
 	}
@@ -124,8 +124,10 @@ public void contentsChanged(ListDataEvent e) {
 		new Thread() {
 			public void run() {
 				slideshowFrame = new SlideshowFrame();
-				if (album.getPicturesList().size() > 0) {
+				if (album.getSize() > 0) {
 					ImageUtils.download((Picture) album.getPicturesList().get(0), getGraphicsConfiguration().getBounds().getSize(), GalleryRemote._().getCore().getMainStatusUpdate(), null);
+				} else {
+					JOptionPane.showMessageDialog(GRAppletSlideshow.this, GRI18n.getString(MODULE, "emptyAlbum"));
 				}
 			}
 		}.start();

diff --git a/com/gallery/GalleryRemote/resources/GRResources.properties b/com/gallery/GalleryRemote/resources/GRResources.properties
@@ -489,3 +489,4 @@ AppletMini.pictures = List of pictures to upload (drag and drop or click Add Pic
 AppletSlideshow.Start = Start slideshow
 AppletSlideshow.Disabled = <html>If some of the options above are greyed-out, the \
 		administrator of this gallery has forced the corresponding settings.</html>
+AppletSlideshow.emptyAlbum = There are no pictures to show in this album. Use the navigation menu at the top to go back to the album view.
diff --git 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.1-b2
+version=1.3.1-b3
 releaseDate=2004/02/12
 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