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

	* Fixed text color in list and tree when selected.
	* State is clean after an upload attemps (since state
	  was saved to the default location).
	* Fixed bug where loading a state with no pictures in it
	  would make the UI disabled.

	Thanks to Robert Harlow for these.

ChangeLog

@@ -1,3 +1,13 @@
+2004-02-12  Pierre-Luc Paour <gallery@paour.com> (1.3.1-b1)
+
+	* Fixed text color in list and tree when selected.
+	* State is clean after an upload attemps (since state
+	  was saved to the default location).
+	* Fixed bug where loading a state with no pictures in it
+	  would make the UI disabled.
+
+	Thanks to Robert Harlow for these.
+
 2004-02-11  Pierre-Luc Paour <gallery@paour.com> (1.3)
 
 	* Fixed moving album to root of Gallery.

com/gallery/GalleryRemote/CoreUtils.java

@@ -159,7 +159,7 @@ public Component getListCellRendererComponent(
 						setForeground(Color.green);
 					}
 				} else {
-					setForeground(Color.black);
+					//setForeground(Color.black);
 				}
 
 				if (GalleryRemote._().properties.getShowThumbnails()) {

com/gallery/GalleryRemote/MainFrame.java

@@ -1366,9 +1366,6 @@ private void saveAsState() {
 			saveState(lastOpenedFile);
 
 			saveMRUItem(lastOpenedFile);
-
-			// We've been saved, we are now clean.
-			setDirtyFlag(false);
 		}
 	}
 
@@ -1380,9 +1377,6 @@ private void saveState() {
 		}
 
 		saveState(lastOpenedFile);
-
-		// We've been saved, we are now clean.
-		setDirtyFlag(false);
 	}
 
 	/**
@@ -1407,6 +1401,10 @@ private void saveState(File f) {
 
 			ObjOut out = new ObjOut(new BufferedWriter(new FileWriter(f)));
 			out.writeObject(galleryArray);
+			out.close();
+
+			// We've been saved, we are now clean.
+			setDirtyFlag(false);
 		} catch (IOException e) {
 			Log.log(Log.LEVEL_ERROR, MODULE, "Exception while trying to save state");
 			Log.logException(Log.LEVEL_ERROR, MODULE, e);
@@ -1571,12 +1569,15 @@ public void run() {
 
 					setGalleries(newGalleries);
 
-					resetUIState();
+					if (selectGallery == null && newGalleries.getSize() > 0) {
+						selectGallery = (Gallery) newGalleries.getElementAt(0);
+					}
 
 					if (selectGallery != null) {
 						jGalleryCombo.setSelectedItem(selectGallery);
 					}
 
+					setInProgress(false);
 				} catch (IOException e) {
 					Log.log(Log.LEVEL_ERROR, MODULE, "Exception while trying to read state");
 					Log.logException(Log.LEVEL_ERROR, MODULE, e);
@@ -1902,7 +1903,7 @@ public Component getTreeCellRendererComponent(
 			if (album != null && album.isHasFetchedImages()) {
 				setForeground(Color.green);
 			} else {
-				setForeground(Color.black);
+				// setForeground(Color.black);
 			}
 
 			setIcon(null);

com/gallery/GalleryRemote/ThumbnailCache.java

@@ -93,22 +93,6 @@ public void run() {
 	}
 
 
-	/**
-	 *  Ask for the thumbnail to be loaded
-	 *
-	 *@param  filename  path to the file
-	 */
-	/*public void preloadThumbnailFilename( String filename ) {
-		Log.log(Log.LEVEL_TRACE, MODULE, "preloadThumbnailFilename " + filename);
-		
-		if (!thumbnails.containsKey(filename)) {
-			toLoad.add( 0, filename );
-
-			rerun();
-		}
-	}*/
-
-
 	/**
 	 * Ask for the thumbnail to be loaded as soon as possible
 	 * 
@@ -131,7 +115,7 @@ public void preloadThumbnailFirst(Picture p) {
 	 * @param pictures enumeration of Picture objects that should be loaded
 	 */
 	public void preloadThumbnails(Iterator pictures) {
-		Log.log(Log.LEVEL_TRACE, MODULE, "preloadThumbnails " + pictures);
+		Log.log(Log.LEVEL_TRACE, MODULE, "preloadThumbnails");
 
 		while (pictures.hasNext()) {
 			Picture p = (Picture) pictures.next();

defaults.properties

@@ -111,7 +111,7 @@ suppressWarningCorrupted=false
 mruCount=4
 
 # By default we load the last edited file when GR launches
-loadLastMRU=true
+loadLastMRU=false
 
 #
 # --- Slideshow ---
@@ -178,6 +178,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.3
-releaseDate=2004/02/11
+version=1.3.1-b1
+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