[Jcrossclient-cvs] jcrossclient Changelog,1.36,1.37 ExamineWin.java,1.8,1.9 InvWin.java,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/jcrossclient/jcrossclient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11133

Modified Files:
	Changelog ExamineWin.java InvWin.java 
Log Message:
create two seperate item context menus for single and multiple item stacks

Index: ExamineWin.java
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/ExamineWin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ExamineWin.java	1 Feb 2006 19:14:29 -0000	1.8
--- ExamineWin.java	19 Feb 2006 23:33:49 -0000	1.9
***************
*** 79,83 ****
  class ExamineWin extends Canvas implements MouseListener, ActionListener {
  	CFclient toplevel; // need this for pixmap handling;
! 	PopupMenu ritem;
  	Picksome pickupsome;

--- 79,83 ----
  class ExamineWin extends Canvas implements MouseListener, ActionListener {
  	CFclient toplevel; // need this for pixmap handling;
! 	PopupMenu item_single, item_plural;
  	Picksome pickupsome;

***************
*** 93,102 ****
  		groundobjs = floorobjs;
  		addMouseListener(this);
! 		ritem = new PopupMenu();
! 		ritem.add(newMenuItem("Examine"));
! 		ritem.add(newMenuItem("Use"));
! 		ritem.add(newMenuItem("Pick Up"));
! 		ritem.add(newMenuItem("Pick Up Some"));
! 		this.add(ritem);
  	}

--- 93,111 ----
  		groundobjs = floorobjs;
  		addMouseListener(this);
! 
! 		/* rather than dynamically constructing these menus, we'll 
! 		 * create two, one for the single item case, one for the stack
! 		 * of items case. */
! 		item_plural = new PopupMenu();
! 		item_plural.add(newMenuItem("Examine"));
! 		item_plural.add(newMenuItem("Use"));
! 		item_plural.add(newMenuItem("Pick Up All"));
! 		item_plural.add(newMenuItem("Pick Up Some"));
! 		this.add(item_plural);
! 		item_single = new PopupMenu();
! 		item_single.add(newMenuItem("Examine"));
! 		item_single.add(newMenuItem("Use"));
! 		item_single.add(newMenuItem("Pick Up"));
! 		this.add(item_single);
  	}

***************
*** 132,136 ****
  		} else
  		if ((buttonmask&InputEvent.BUTTON3_MASK)>0) {
! 			ritem.show( this.getParent(), evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
  		} else // yes, we want this LAST!
  		if ((buttonmask&InputEvent.BUTTON1_MASK)>0) {
--- 141,151 ----
  		} else
  		if ((buttonmask&InputEvent.BUTTON3_MASK)>0) {
! 			if (clickobj.getNumObjs() > 1) {
! 				item_plural.show(this.getParent(), 
! 				  evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
! 			} else {
! 				item_single.show(this.getParent(), 
! 				  evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
! 			}
  		} else // yes, we want this LAST!
  		if ((buttonmask&InputEvent.BUTTON1_MASK)>0) {
***************
*** 147,151 ****
  			toplevel.examineObj(last_clicked_object.getTag());
  		}
! 		else if (cmd.equals("Pick Up")) {
  			toplevel.pickupObj(last_clicked_object.getTag());
  			updateDisplay();
--- 162,166 ----
  			toplevel.examineObj(last_clicked_object.getTag());
  		}
! 		else if (cmd.equals("Pick Up") || cmd.equals("Pick Up All")) {
  			toplevel.pickupObj(last_clicked_object.getTag());
  			updateDisplay();

Index: InvWin.java
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/InvWin.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** InvWin.java	1 Feb 2006 19:14:29 -0000	1.12
--- InvWin.java	19 Feb 2006 23:33:49 -0000	1.13
***************
*** 134,138 ****
  // displays, AND HOLDS actual inventory of player
  class InvWin extends Canvas implements MouseListener, ActionListener {
! 	PopupMenu ritem;
  	int objpixheight=MapWin.pixheight+8;
  	CFclient toplevel;
--- 134,138 ----
  // displays, AND HOLDS actual inventory of player
  class InvWin extends Canvas implements MouseListener, ActionListener {
! 	PopupMenu item_single, item_plural;
  	int objpixheight=MapWin.pixheight+8;
  	CFclient toplevel;
***************
*** 150,162 ****
  		PlayerInventory = objs;
  		addMouseListener(this);
! 		ritem = new PopupMenu();
! 		ritem.add(newMenuItem("Examine"));
! 		ritem.add(newMenuItem("Use"));
! 		ritem.add(newMenuItem("Drop"));
! 		ritem.add(newMenuItem("Drop Some"));
! 		ritem.add(newMenuItem("Lock"));
! 		ritem.add(newMenuItem("Mark"));
! 		ritem.add(newMenuItem("Rename"));
! 		this.add(ritem);
  	}

--- 150,174 ----
  		PlayerInventory = objs;
  		addMouseListener(this);
! 
! 		/* rather than dynamically constructing these menus, we'll 
! 		 * create two, one for the single item case, one for the stack
! 		 * of items case. */
! 		item_plural = new PopupMenu();
! 		item_plural.add(newMenuItem("Examine"));
! 		item_plural.add(newMenuItem("Use"));
! 		item_plural.add(newMenuItem("Drop All"));
! 		item_plural.add(newMenuItem("Drop Some"));
! 		item_plural.add(newMenuItem("Lock"));
! 		item_plural.add(newMenuItem("Mark"));
! 		item_plural.add(newMenuItem("Rename"));
! 		this.add(item_plural);
! 		item_single = new PopupMenu();
! 		item_single.add(newMenuItem("Examine"));
! 		item_single.add(newMenuItem("Use"));
! 		item_single.add(newMenuItem("Drop"));
! 		item_single.add(newMenuItem("Lock"));
! 		item_single.add(newMenuItem("Mark"));
! 		item_single.add(newMenuItem("Rename"));
! 		this.add(item_single);
  	}

***************
*** 173,177 ****
  			toplevel.examineObj(last_clicked_object.getTag());
  		}
! 		else if (cmd.equals("Drop")) {
  			if (last_clicked_object.isLocked()) {
  				toplevel.talkwin.addDisplayLine("This object is locked.\n");
--- 185,189 ----
  			toplevel.examineObj(last_clicked_object.getTag());
  		}
! 		else if (cmd.equals("Drop") || cmd.equals("Drop All")) {
  			if (last_clicked_object.isLocked()) {
  				toplevel.talkwin.addDisplayLine("This object is locked.\n");
***************
*** 234,238 ****
  		} else
  		if ((buttonmask&InputEvent.BUTTON3_MASK)>0) {
! 			ritem.show(this.getParent(), evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
  		} else // yes, we want this LAST!
  		if ((buttonmask&InputEvent.BUTTON1_MASK)>0) {
--- 246,256 ----
  		} else
  		if ((buttonmask&InputEvent.BUTTON3_MASK)>0) {
! 			if (clickobj.getNumObjs() > 1) {
! 				item_plural.show(this.getParent(), 
! 				  evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
! 			} else {
! 				item_single.show(this.getParent(), 
! 				  evt.getX()-(int)offset.getX(), evt.getY()-(int)offset.getY());
! 			}
  		} else // yes, we want this LAST!
  		if ((buttonmask&InputEvent.BUTTON1_MASK)>0) {

Index: Changelog
===================================================================
RCS file: /cvsroot/jcrossclient/jcrossclient/Changelog,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Changelog	12 Feb 2006 20:52:12 -0000	1.36
--- Changelog	19 Feb 2006 23:33:49 -0000	1.37
***************
*** 3,6 ****
--- 3,7 ----
  # Unlike with the server changelog, the most recent entry is last

+ 
  09/11/2005 - Mapwin/CFclient/Examinewin - scale images in examine view.
  09/11/2005 - CFClient - implement the reccomendations of
***************
*** 269,274 ****
  01/02/2006 - everything - ran pmd on the code, fixed most of what it found, also some misc cleanups.

! 02/12/2006 - build.xml - told javac to warn about deprecations
  	CFclient - added first stab at an actions menu
  	TalkWin - added setAction public method, which is used by some actions menu entries
! 	
\ No newline at end of file
--- 270,278 ----
  01/02/2006 - everything - ran pmd on the code, fixed most of what it found, also some misc cleanups.

! 12/02/2006 - build.xml - told javac to warn about deprecations
  	CFclient - added first stab at an actions menu
  	TalkWin - added setAction public method, which is used by some actions menu entries
! 	
! 19/02/2006 - InvWin	- create two menus for handling items, one for single items, one for multiple items
! 
! 	     ExamineWin -  ditto.