6 new revisions: Revision: 032f09904a80 Branch: rt1508-MoveUTDLibrary Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Tue Feb 24 14:37:10 2015 UTC Log: merge with default https://code.google.com/p/brailleblaster/source/detail?r=032f09904a80 Revision: 24a35fee2b19 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Thu Feb 26 13:57:22 2015 UTC Log: merge with default https://code.google.com/p/brailleblaster/source/detail?r=24a35fee2b19 Revision: d807f57e6524 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 16:31:50 2015 UTC Log: merge default https://code.google.com/p/brailleblaster/source/detail?r=d807f57e6524 Revision: e2c6e19254d8 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:20:09 2015 UTC Log: made last search term visible in combo box https://code.google.com/p/brailleblaster/source/detail?r=e2c6e19254d8 Revision: a0de2e2fe565 Branch: 2138-lastStringInCombo Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:22:12 2015 UTC Log: last string added to combo https://code.google.com/p/brailleblaster/source/detail?r=a0de2e2fe565 Revision: c44328cf669b Branch: rt1508-MoveUTDLibrary Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:50:47 2015 UTC Log: Merge broken heads https://code.google.com/p/brailleblaster/source/detail?r=c44328cf669b ============================================================================== Revision: 032f09904a80 Branch: rt1508-MoveUTDLibrary Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Tue Feb 24 14:37:10 2015 UTC Log: merge with default https://code.google.com/p/brailleblaster/source/detail?r=032f09904a80 ============================================================================== Revision: 24a35fee2b19 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Thu Feb 26 13:57:22 2015 UTC Log: merge with default https://code.google.com/p/brailleblaster/source/detail?r=24a35fee2b19 ============================================================================== Revision: d807f57e6524 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 16:31:50 2015 UTC Log: merge default https://code.google.com/p/brailleblaster/source/detail?r=d807f57e6524 ============================================================================== Revision: e2c6e19254d8 Branch: rt1898-firstWord Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:20:09 2015 UTC Log: made last search term visible in combo box https://code.google.com/p/brailleblaster/source/detail?r=e2c6e19254d8 Modified: /src/main/org/brailleblaster/search/SearchDialog.java =======================================--- /src/main/org/brailleblaster/search/SearchDialog.java Thu Feb 19 18:45:00 2015 UTC +++ /src/main/org/brailleblaster/search/SearchDialog.java Fri Feb 27 19:20:09 2015 UTC
@@ -181,7 +181,6 @@ lblFind.setText("Find:"); Label label = new Label(shlFindreplace, SWT.NONE); // formToolkit.adapt(label, true, true); - searchCombo = new Combo(shlFindreplace, SWT.NONE); searchCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 3, 1)); @@ -189,7 +188,9 @@ if (searchList != null) { for (int i = 0; i < searchArraySize; i++) { searchCombo.add(searchList[i]); + searchCombo.setText(searchList[i].toString()); }// for + }// if searchCombo.getData(); @@ -583,7 +584,10 @@ closeBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - shlFindreplace.close(); +// shlFindreplace.close(); + shlFindreplace.setVisible(false); + display.sleep(); +// searchCombo.setFocus(); } // widgetSelected() @@ -984,7 +988,10 @@ closeBtn.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - shlFindreplace.close(); +// shlFindreplace.close(); + shlFindreplace.setVisible(false); + display.sleep(); +// searchCombo.setFocus(); } // widgetSelected() ============================================================================== Revision: a0de2e2fe565 Branch: 2138-lastStringInCombo Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:22:12 2015 UTC Log: last string added to combo https://code.google.com/p/brailleblaster/source/detail?r=a0de2e2fe565 ============================================================================== Revision: c44328cf669b Branch: rt1508-MoveUTDLibrary Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx> Date: Fri Feb 27 19:50:47 2015 UTC Log: Merge broken heads https://code.google.com/p/brailleblaster/source/detail?r=c44328cf669b