More enabling-disabling of UI.

gallery · Sep 22, 2002 · 4ecf28c · 4ecf28c
1 parent dffa820
commit 4ecf28c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/com/gallery/GalleryRemote/MainFrame.java b/com/gallery/GalleryRemote/MainFrame.java
@@ -237,14 +237,15 @@ void resetUIState() {
 		fetch.setEnabled( !mInProgress );
 		gallery.setEnabled( !mInProgress );
 		newGallery.setEnabled( !mInProgress );
-		album.setEnabled( !mInProgress );
 		username.setEnabled( !mInProgress );
 		password.setEnabled( !mInProgress );
 
 		// if the selected album is uploading, disable everything
-		browse.setEnabled( ! mInProgress && mAlbum != null);
-		pictureInspector.setEnabled( ! mInProgress && mAlbum != null);
-		picturesList.setEnabled( ! mInProgress && mAlbum != null);
+		boolean enabled = ! mInProgress && mAlbum != null && album.getModel().getSize() >= 1;
+		browse.setEnabled( enabled );
+		pictureInspector.setEnabled( enabled );
+		picturesList.setEnabled( enabled );
+		album.setEnabled( enabled );
 
 		if ( mAlbum == null) {
 			pictureInspector.setPictures( (Object[]) null );
@@ -292,6 +293,7 @@ private void updateGalleryParams() {
 		}
 
 		updateAlbumCombo();
+		resetUIState();
 	}