[Compiere-cvslog] CVS: client/Src/org/compiere/apps AGlassPane.java,1.5,1.5.4.1 APanel.java,1.79.2.13,1.79.2.14

[Jacob P. <jpe...@us...>]

Update of /cvsroot/compiere/client/Src/org/compiere/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9328/Src/org/compiere/apps

Modified Files:
      Tag: pbs_payment
	AGlassPane.java APanel.java 
Log Message:
Edit restriction button added

Index: AGlassPane.java
===================================================================
RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/AGlassPane.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** AGlassPane.java	14 Feb 2003 06:44:13 -0000	1.5
--- AGlassPane.java	16 Nov 2004 12:36:07 -0000	1.5.4.1
***************
*** 57,61 ****
  	private int                 m_timervalue = 0;
  	private int                 m_timermax = 0;
! 
  	/**
  	 *  Set Message
--- 57,62 ----
  	private int                 m_timervalue = 0;
  	private int                 m_timermax = 0;
! 	private int 				xProgress = 0;
! 	private int 				yProgress = 0;
  	/**
  	 *  Set Message
***************
*** 104,113 ****
  		m_timervalue = 0;
  
! 		//  Start Timer
  		m_timer = new Timer (1000, this);     //  every second
  		m_timer.start();
  
- 		if (!isVisible())
- 			setVisible(true);
  		repaint();
  	}   //  setBusyTimer
--- 105,117 ----
  		m_timervalue = 0;
  
! 		
! 		
! 		if (!isVisible())
! 			setVisible(true);
! 		//Start Timer
! 		
  		m_timer = new Timer (1000, this);     //  every second
  		m_timer.start();
  
  		repaint();
  	}   //  setBusyTimer
***************
*** 119,129 ****
  	public void actionPerformed (ActionEvent e)
  	{
! 		if (m_timermax > 0)
  		{
  			m_timervalue++;
  			if (m_timervalue > m_timermax)
  				m_timervalue = 0;
! 			repaint();
  		}
  	}   //  actionPerformed
  
--- 123,137 ----
  	public void actionPerformed (ActionEvent e)
  	{
! 		if (m_timermax > 0 && isVisible())
  		{
  			m_timervalue++;
  			if (m_timervalue > m_timermax)
  				m_timervalue = 0;
! 			repaint(1, xProgress, yProgress, 150,3);
  		}
+ 		
+ 		if (!isVisible())
+ 			m_timer.stop();
+ 		
  	}   //  actionPerformed
  
***************
*** 141,147 ****
  	public void paintComponent (Graphics g)
  	{
! 		Dimension panelSize = getSize();
! 		g.setColor(new Color(1f,1f,1f, 0.4f));      //  .5 is a bit too light
! 		g.fillRect(0,0, panelSize.width, panelSize.height);
  		//
  		g.setFont(s_font);
--- 149,155 ----
  	public void paintComponent (Graphics g)
  	{
! 		Dimension panelSize = getSize();			
! 		//g.setColor(new Color(1,1,1, 0.4f));      //  .5 is a bit too light
! 		//g.fillRect(0,0, panelSize.width, panelSize.height);
  		//
  		g.setFont(s_font);
***************
*** 150,154 ****
  		Dimension messageSize = new Dimension (fm.stringWidth(m_message), fm.getAscent() + fm.getDescent());
  		Dimension imageSize = new Dimension (s_image.getWidth(this), s_image.getHeight(this));
! 		Dimension progressSize = new Dimension(150, 15);
  	//	System.out.println("Panel=" + panelSize + " - Message=" + messageSize + " - Image=" + imageSize + " - Progress=" + progressSize);
  
--- 158,162 ----
  		Dimension messageSize = new Dimension (fm.stringWidth(m_message), fm.getAscent() + fm.getDescent());
  		Dimension imageSize = new Dimension (s_image.getWidth(this), s_image.getHeight(this));
! 		Dimension progressSize = new Dimension(150, 3);
  	//	System.out.println("Panel=" + panelSize + " - Message=" + messageSize + " - Image=" + imageSize + " - Progress=" + progressSize);
  
***************
*** 162,166 ****
  		int yImage = (panelSize.height/2) - (height/2);
  		int yMessage = yImage + imageSize.height + GAP + fm.getAscent();
! 		int yProgress = yMessage + fm.getDescent() + GAP;
  	//	System.out.println("yImage=" + yImage + " - yMessage=" + yMessage);
  
--- 170,174 ----
  		int yImage = (panelSize.height/2) - (height/2);
  		int yMessage = yImage + imageSize.height + GAP + fm.getAscent();
! 		yProgress = yMessage + fm.getDescent() + GAP;
  	//	System.out.println("yImage=" + yImage + " - yMessage=" + yMessage);
  
***************
*** 173,177 ****
  		int xImage = (panelSize.width/2) - (imageSize.width/2);
  		int xMessage = (panelSize.width/2) - (messageSize.width/2);
! 		int xProgress = (panelSize.width/2) - (progressSize.width/2);
  
  		g.drawImage(s_image, xImage, yImage, this);
--- 181,185 ----
  		int xImage = (panelSize.width/2) - (imageSize.width/2);
  		int xMessage = (panelSize.width/2) - (messageSize.width/2);
! 		xProgress = (panelSize.width/2) - (progressSize.width/2);
  
  		g.drawImage(s_image, xImage, yImage, this);

Index: APanel.java
===================================================================
RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/APanel.java,v
retrieving revision 1.79.2.13
retrieving revision 1.79.2.14
diff -C2 -d -r1.79.2.13 -r1.79.2.14
*** APanel.java	5 Oct 2004 22:25:46 -0000	1.79.2.13
--- APanel.java	16 Nov 2004 12:36:07 -0000	1.79.2.14
***************
*** 14,18 ****
  package org.compiere.apps;
  
- 
  import javax.swing.*;
  import javax.swing.event.*;
--- 14,17 ----
***************
*** 36,80 ****
  
  /**
[...3479 lines suppressed...]
  	}
  	//<<JTP/UI
  
! }	//	APanel
--- 1955,1969 ----
  		s += "]";
  		return s;
! 	} //  toString
  
  	//>>JTP/UI
  	/**
! 	 * Makes it possible for other classes to request focus set to the
! 	 * gridcontroller
  	 */
! 	public void requestFocusInWindowForGridController() {
  		m_curGC.requestFocusInWindow();
  	}
  	//<<JTP/UI
  
! } //	APanel