2008-09-09 Pierre-Luc Paour <gallery@paour.com> (1.5.1-b40)

* Fixed issue with copy/paste.
gallery · Sep 9, 2008 · 146d229 · 146d229
1 parent f90fff8
commit 146d229
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 26 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-09  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b40)
+
+	* Fixed issue with copy/paste.
+
 2008-07-31  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b39)
 
 	* Users can select Gallery URLs that GR should automatically

diff --git a/build.xml b/build.xml
@@ -49,17 +49,29 @@
   </copy>
  </target>
 
- <target name="run" depends="compile"
-  description="compile then run">
+    <target name="run" depends="compile"
+     description="compile then run">
 
-  <java classname="com.gallery.GalleryRemote.GalleryRemote" fork="true" maxmemory="256M">
-   <classpath>
-    <pathelement location="lib/metadata-extractor-2.1.jar"/>
-    <pathelement path="${build}"/>
-    <pathelement path="img"/>
-   </classpath>
-  </java>
- </target>
+     <java classname="com.gallery.GalleryRemote.GalleryRemote" fork="true" maxmemory="256M">
+      <classpath>
+       <pathelement location="lib/metadata-extractor-2.1.jar"/>
+       <pathelement path="${build}"/>
+       <pathelement path="img"/>
+      </classpath>
+     </java>
+    </target>
+
+    <target name="debug" depends="compile"
+     description="compile then run">
+
+     <java classname="com.gallery.GalleryRemote.GalleryRemote" fork="true" maxmemory="256M" jvmargs="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005">
+      <classpath>
+       <pathelement location="lib/metadata-extractor-2.1.jar"/>
+       <pathelement path="${build}"/>
+       <pathelement path="img"/>
+      </classpath>
+     </java>
+    </target>
 
  <target name="jar" depends="clean,compile"
   description="create a jar of the source">

diff --git a/com/gallery/GalleryRemote/DroppableList.java b/com/gallery/GalleryRemote/DroppableList.java
@@ -289,7 +289,7 @@ public void dropActionChanged(DragSourceDragEvent dragSourceDragEvent) {
 	/* ********* DragGestureListener ********** */
 	public void dragGestureRecognized(DragGestureEvent event) {
 		Log.log(Log.LEVEL_TRACE, MODULE, "dragGestureRecognized");
-		PictureSelection ps = new PictureSelection(this);
+		PictureSelection ps = new PictureSelection(this, false);
 
 		//pull out existing pictures
 		if (!ps.isEmpty()) {

diff --git a/com/gallery/GalleryRemote/MainFrame.java b/com/gallery/GalleryRemote/MainFrame.java
@@ -313,7 +313,7 @@ private void setGalleries(DefaultComboBoxModel galleries) {
 				if (!foundAutoLoad) {
 					jGalleryCombo.setSelectedIndex(i);
 					foundAutoLoad = true;
-				}				
+				}
 			}
 		}
 
@@ -915,16 +915,18 @@ public void showAboutBox() {
 	}
 
 	public void doCut() {
-		doCopy();
-		deleteSelectedPictures();
+		if (jPicturesList.isEnabled() && jPicturesList.getSelectedIndices().length > 0) {
+			ps = new PictureSelection(jPicturesList, false);
+			deleteSelectedPictures();
 
-		// We've been modified, we are now dirty.
-		//setDirtyFlag(true);
+			// We've been modified, we are now dirty.
+			//setDirtyFlag(true);
+		}
 	}
 
 	public void doCopy() {
 		if (jPicturesList.isEnabled() && jPicturesList.getSelectedIndices().length > 0) {
-			ps = new PictureSelection(jPicturesList);
+			ps = new PictureSelection(jPicturesList, true);
 		}
 	}
 
@@ -1053,7 +1055,6 @@ private void jbInit()
 		jMenuItemAbout.setText(GRI18n.getString(MODULE, "menuAbout"));
 		jMenuItemAbout.setIcon(GalleryRemote.iAbout);
 
-		//jScrollPane1.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		jNewGalleryButton.setText(GRI18n.getString(MODULE, "newGalleryBtn"));
 		jNewGalleryButton.setActionCommand("NewGallery");
 		jNewGalleryButton.setIcon(GalleryRemote.iNewGallery);
@@ -1076,10 +1077,10 @@ private void jbInit()
 		jInspectorDivider.add(jInspectorPanel, JSplitPane.RIGHT);
 		jInspectorDivider.add(jAlbumPictureDivider, JSplitPane.LEFT);
 		JScrollPane pictureInspectorScroll = new JScrollPane(jPictureInspector);
-		pictureInspectorScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		pictureInspectorScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		jInspectorPanel.add(pictureInspectorScroll, CARD_PICTURE);
 		JScrollPane albumInspectorScroll = new JScrollPane(jAlbumInspector);
-		albumInspectorScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+		albumInspectorScroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
 		jInspectorPanel.add(albumInspectorScroll, CARD_ALBUM);
 		jAlbumPictureDivider.add(jPictureScroll, JSplitPane.RIGHT);
 		jAlbumPictureDivider.add(jAlbumPanel, JSplitPane.LEFT);

diff --git a/com/gallery/GalleryRemote/PictureSelection.java b/com/gallery/GalleryRemote/PictureSelection.java
@@ -44,12 +44,15 @@ public class PictureSelection extends ArrayList implements Transferable, Clipboa
 	public PictureSelection() {
 	}
 
-	public PictureSelection(JList list) {
+	public PictureSelection(JList list, boolean clone) {
 		int[] selIndices = list.getSelectedIndices();
 		for (int i = 0; i < selIndices.length; i++) {
 			int selIndex = selIndices[i];
 			if (selIndex != -1) {
 				Picture p = (Picture) list.getModel().getElementAt(selIndex);
+				if (clone) {
+					p = (Picture) p.clone();
+				}
 				add(p);
 			}
 		}

diff --git a/com/gallery/GalleryRemote/model/Picture.java b/com/gallery/GalleryRemote/model/Picture.java
@@ -98,6 +98,8 @@ public Object clone() {
 		newPicture.source = source;
 
 		newPicture.extraFields = extraFields;
+
+		newPicture.hidden = hidden;
 
 		newPicture.angle = angle;
 		newPicture.flipped = flipped;
@@ -110,14 +112,15 @@ public Object clone() {
 		newPicture.sizeResized = sizeResized;
 		newPicture.urlThumbnail = urlThumbnail;
 		newPicture.sizeThumbnail = sizeThumbnail;
+		newPicture.cropTo = cropTo;
+
+		newPicture.albumOnServer = albumOnServer;
+		newPicture.indexOnServer = indexOnServer;
 
 		newPicture.fileSize = fileSize;
 		newPicture.escapedCaption = escapedCaption;
 		newPicture.indexCache = indexCache;
 
-		newPicture.albumOnServer = albumOnServer;
-		newPicture.indexOnServer = indexOnServer;
-
 		return newPicture;
 	}
 

diff --git a/defaults.properties b/defaults.properties
@@ -322,6 +322,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.5.1-b39
-releaseDate=2008/07/31
+version=1.5.1-b40
+releaseDate=2008/09/09
 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\nSaverBeans