From: Anneli <an...@us...> - 2005-03-18 14:15:52
|
Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6369/src/org/redpos/client/ui/plugin/function Modified Files: Logoff.java FindReceiptUI.java UserInputUI.java FindProductUI.java ConfirmActionUI.java Log Message: Change color on buttons with focus Index: FindProductUI.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/FindProductUI.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FindProductUI.java 1 Mar 2005 14:26:52 -0000 1.6 --- FindProductUI.java 18 Mar 2005 14:15:43 -0000 1.7 *************** *** 26,29 **** --- 26,32 ---- import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; + import org.eclipse.swt.events.FocusAdapter; + import org.eclipse.swt.events.FocusEvent; + import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; *************** *** 33,36 **** --- 36,40 ---- import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; + import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; *************** *** 93,96 **** --- 97,104 ---- private String lastFind; + private static Color blue; + private static Color black; + + /** * Constructor *************** *** 107,110 **** --- 115,121 ---- setBackground(parent.getBackground()); productSearch = productSearchInput; + + blue = new Color(parent.getDisplay(),51,51,255); + black = new Color(parent.getDisplay(),0,0,0); init(); *************** *** 302,305 **** --- 313,340 ---- productInfoSalesupportData.widthHint = 345; productInfoSalesupport.setLayoutData(productInfoSalesupportData); + + // create focus listener for button + FocusListener buttonFocusListener = new FocusAdapter() + { + public void focusGained(FocusEvent e) + { + // when the button receives the focus, change color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(blue); + } + } + + public void focusLost(FocusEvent e) + { + // when the button receives the focus, go back to default color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(black); + } + } + }; // create composite for the buttons *************** *** 328,331 **** --- 363,367 ---- }; productInfoBackButton.addListener(SWT.Selection, backButtonListener); + productInfoBackButton.addFocusListener(buttonFocusListener); productInfoToRegisterButton = new Button(buttonComposite, SWT.PUSH); *************** *** 344,347 **** --- 380,384 ---- productInfoToRegisterButton.addListener(SWT.Selection, toRegisterButtonListener); + productInfoToRegisterButton.addFocusListener(buttonFocusListener); // add traverse listeners to handle focus order Index: UserInputUI.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/UserInputUI.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** UserInputUI.java 23 Nov 2004 16:02:26 -0000 1.1 --- UserInputUI.java 18 Mar 2005 14:15:43 -0000 1.2 *************** *** 25,28 **** --- 25,31 ---- import org.eclipse.swt.SWT; + import org.eclipse.swt.events.FocusAdapter; + import org.eclipse.swt.events.FocusEvent; + import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; *************** *** 30,33 **** --- 33,37 ---- import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; + import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; *************** *** 67,70 **** --- 71,78 ---- private Button cancelButton; + + private static Color blue; + + private static Color black; /** *************** *** 87,90 **** --- 95,101 ---- this.listener = listener; setBackground(parent.getBackground()); + + blue = new Color(parent.getDisplay(),51,51,255); + black = new Color(parent.getDisplay(),0,0,0); init(); *************** *** 212,215 **** --- 223,250 ---- } }); + // create focus listener for button + FocusListener buttonFocusListener = new FocusAdapter() + { + public void focusGained(FocusEvent e) + { + // when the button receives the focus, change color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(blue); + } + } + + public void focusLost(FocusEvent e) + { + // when the button receives the focus, go back to default color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(black); + } + } + }; + okButton.addFocusListener(buttonFocusListener); // set OK button as the default button *************** *** 228,231 **** --- 263,267 ---- } }); + cancelButton.addFocusListener(buttonFocusListener); // create a traverse listener for the cancel button Index: Logoff.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/Logoff.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Logoff.java 19 Feb 2005 08:37:14 -0000 1.2 --- Logoff.java 18 Mar 2005 14:15:43 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; + import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; *************** *** 338,341 **** --- 339,346 ---- private Composite parent; + + private Color blue; + + private Color black; /** * @param arg0 *************** *** 351,354 **** --- 356,362 ---- this.setBackground(parent.getBackground()); + + blue = new Color(parent.getDisplay(),51,51,255); + black = new Color(parent.getDisplay(),0,0,0); init(); *************** *** 467,471 **** buttonComposite.setBackground(getBackground()); ! // create ok button Button okButton = new Button(buttonComposite, SWT.PUSH); --- 475,502 ---- buttonComposite.setBackground(getBackground()); ! // create focus listener for button ! FocusListener buttonFocusListener = new FocusAdapter() ! { ! public void focusGained(FocusEvent e) ! { ! // when the button receives the focus, change color ! if(e.widget instanceof Button) ! { ! Button button = (Button)e.widget; ! button.setForeground(blue); ! } ! } ! ! public void focusLost(FocusEvent e) ! { ! // when the button receives the focus, go back to default color ! if(e.widget instanceof Button) ! { ! Button button = (Button)e.widget; ! button.setForeground(black); ! } ! } ! }; ! // create ok button Button okButton = new Button(buttonComposite, SWT.PUSH); *************** *** 481,484 **** --- 512,516 ---- okButton.addListener(SWT.Selection, okButtonListener); okButton.setBackground(getBackground()); + okButton.addFocusListener(buttonFocusListener); // create cancel button *************** *** 496,499 **** --- 528,533 ---- cancelButton.addListener(SWT.Selection, cancelButtonListener); cancelButton.setBackground(getBackground()); + cancelButton.addFocusListener(buttonFocusListener); + } Index: ConfirmActionUI.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/ConfirmActionUI.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ConfirmActionUI.java 20 Feb 2005 11:05:42 -0000 1.3 --- ConfirmActionUI.java 18 Mar 2005 14:15:43 -0000 1.4 *************** *** 27,30 **** --- 27,33 ---- import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; + import org.eclipse.swt.events.FocusAdapter; + import org.eclipse.swt.events.FocusEvent; + import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; *************** *** 32,35 **** --- 35,39 ---- import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; + import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; *************** *** 85,88 **** --- 89,96 ---- private Button noButton; + + private static Color blue; + + private static Color black; /** *************** *** 109,112 **** --- 117,123 ---- this.parent = parent; + + blue = new Color(parent.getDisplay(),51,51,255); + black = new Color(parent.getDisplay(),0,0,0); init(message); *************** *** 173,176 **** --- 184,211 ---- buttonCompositeData.verticalAlignment = GridData.END; buttonComposite.setLayoutData(buttonCompositeData); + + // create focus listener for button + FocusListener buttonFocusListener = new FocusAdapter() + { + public void focusGained(FocusEvent e) + { + // when the button receives the focus, change color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(blue); + } + } + + public void focusLost(FocusEvent e) + { + // when the button receives the focus, go back to default color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(black); + } + } + }; if(type == YES_NO_SELECTION) *************** *** 181,184 **** --- 216,220 ---- yesButton.setData(new Integer(YES_OPTION)); yesButton.addListener(SWT.Selection, buttonListener); + yesButton.addFocusListener(buttonFocusListener); KeyListener yesButtonKeyListener = new KeyAdapter() *************** *** 202,205 **** --- 238,242 ---- noButton.setData(new Integer(NO_OPTION)); noButton.addListener(SWT.Selection, buttonListener); + noButton.addFocusListener(buttonFocusListener); KeyListener noButtonKeyListener = new KeyAdapter() *************** *** 261,264 **** --- 298,302 ---- okButton.setData(new Integer(OK_OPTION)); okButton.addListener(SWT.Selection, buttonListener); + okButton.addFocusListener(buttonFocusListener); KeyListener okButtonKeyListener = new KeyAdapter() Index: FindReceiptUI.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/FindReceiptUI.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FindReceiptUI.java 1 Mar 2005 14:26:52 -0000 1.4 --- FindReceiptUI.java 18 Mar 2005 14:15:43 -0000 1.5 *************** *** 30,33 **** --- 30,36 ---- import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; + import org.eclipse.swt.events.FocusAdapter; + import org.eclipse.swt.events.FocusEvent; + import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; *************** *** 37,40 **** --- 40,44 ---- import org.eclipse.swt.events.TraverseEvent; import org.eclipse.swt.events.TraverseListener; + import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridLayout; *************** *** 83,86 **** --- 87,92 ---- private Label receiptType; private ReceiptTableItemData receiptTableItemData; + private static Color blue; + private static Color black; *************** *** 97,100 **** --- 103,109 ---- setBackground(parent.getBackground()); + + blue = new Color(parent.getDisplay(),51,51,255); + black = new Color(parent.getDisplay(),0,0,0); init(); *************** *** 334,337 **** --- 343,370 ---- receiptCashier.setLayoutData(receiptCashierData); + // create focus listener for button + FocusListener buttonFocusListener = new FocusAdapter() + { + public void focusGained(FocusEvent e) + { + // when the button receives the focus, change color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(blue); + } + } + + public void focusLost(FocusEvent e) + { + // when the button receives the focus, go back to default color + if(e.widget instanceof Button) + { + Button button = (Button)e.widget; + button.setForeground(black); + } + } + }; + //create composite for the buttons Composite buttonComposite = new Composite(receiptInfo, SWT.NORMAL); *************** *** 358,361 **** --- 391,395 ---- }; receiptInfoBackButton.addListener(SWT.Selection, backButtonListener); + receiptInfoBackButton.addFocusListener(buttonFocusListener); //add to receipt button *************** *** 373,376 **** --- 407,411 ---- }; receiptInfoToRegisterButton.addListener(SWT.Selection, toRegisterButtonListener); + receiptInfoToRegisterButton.addFocusListener(buttonFocusListener); //add traverse listeners to handle focus order |