2006-02-27 Pierre-Luc Paour <gallery@paour.com> (1.5.1-b14)

	* GR will no longer perform HTML entities escaping when uploading
	  to G2.
	* Fixed DHTML during and after upload with mini applet in G2.

ChangeLog

@@ -1,3 +1,18 @@
+2006-02-27  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b14)
+
+	* GR will no longer perform HTML entities escaping when uploading
+	  to G2.
+	* Fixed DHTML during and after upload with mini applet in G2.
+
+2006-02-26  Alan Harder (1.5.1-b13)
+
+	* Localization fixes for applets:
+	  New gr_locale applet parameter for specifying locale
+	  Include resource bundles in the AppletMini jar
+	  Add GRI18n.getString for two untranslatable strings
+	* Implemented showAppletResize property (it is supposed to hide
+	  this checkbox when false, but there was no code to do this)
+
 2006-02-20  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b12)
 
 	* Fixed auto charset support broken in b11.

com/gallery/GalleryRemote/GRAppletMini.java

@@ -362,7 +362,7 @@ public void valueChanged(ListSelectionEvent e) {
 	}
 
 	public void g2Feedback(String method, Object[] params) {
-		if (gallery.galleryVersion == 2) {
+		if (gallery.getGalleryVersion() == 2) {
 			try {
 				Log.log(Log.LEVEL_TRACE, MODULE, "Invoking Javascript method '" + method + "' with " + params);
 				call.invoke(window, new Object[] {method, params});

com/gallery/GalleryRemote/GalleryComm2.java

@@ -510,8 +510,8 @@ public void actionPerformed(ActionEvent e) {
 
 		boolean uploadPicture(Picture p, Picture picture) {
 			try {
-				boolean escapeCaptions = GalleryRemote._().properties.getBooleanProperty(HTML_ESCAPE_CAPTIONS);
-				boolean utf8 = !escapeCaptions && p.getParentAlbum().getGallery().galleryVersion == 2;
+				boolean utf8 = p.getParentAlbum().getGallery().getGalleryVersion() == 2;
+				boolean escapeCaptions = !utf8 && GalleryRemote._().properties.getBooleanProperty(HTML_ESCAPE_CAPTIONS);
 
 				if (utf8) {
 					Log.log(Log.LEVEL_INFO, MODULE, "Will upload using UTF-8 for text data");
@@ -981,7 +981,7 @@ void runTask() {
 			status(su, StatusUpdate.LEVEL_GENERIC, GRI18n.getString(MODULE, "newAlbm", new Object[] { albumName, g.toString() }));
 
 			boolean escapeCaptions = GalleryRemote._().properties.getBooleanProperty(HTML_ESCAPE_CAPTIONS);
-			boolean utf8 = !escapeCaptions && parentAlbum.getGallery().galleryVersion == 2;
+			boolean utf8 = !escapeCaptions && parentAlbum.getGallery().getGalleryVersion() == 2;
 
 			if (utf8) {
 				Log.log(Log.LEVEL_INFO, MODULE, "Will upload using UTF-8 for text data");

com/gallery/GalleryRemote/model/Album.java

@@ -659,7 +659,7 @@ public void setExtraFieldsString(String extraFieldsString) {
 			extraFields = new ArrayList();
 			StringTokenizer st = new StringTokenizer(extraFieldsString, ",");
 			List noShow = null;
-			if (getGallery().galleryVersion == 1) {
+			if (getGallery().getGalleryVersion() == 1) {
 				noShow = extraFieldsNoShow;
 			} else {
 				noShow = extraFieldsNoShowG2;

com/gallery/GalleryRemote/model/Gallery.java

@@ -890,7 +890,7 @@ public ArrayList getFlatAlbumList() {
 			}
 
 			// G2 root is a normal album, don't add a fake root...
-			if (galleryVersion == 2 && flatAlbumList != null) {
+			if (getGalleryVersion() == 2 && flatAlbumList != null) {
 				flatAlbumList.remove(getRoot());
 			}
 		}
@@ -912,6 +912,11 @@ public Album createRootAlbum() {
 	}
 
 	public int getGalleryVersion() {
+		if (forceGalleryVersion != 0) {
+			// override
+			return forceGalleryVersion;
+		}
+
 		return galleryVersion;
 	}
 

defaults.properties

@@ -308,6 +308,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.5.1-b12
-releaseDate=2006/02/20
+version=1.5.1-b14
+releaseDate=2006/02/27
 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\nSeth Ladd\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor