[brailleblaster] 3 new revisions pushed by rebecca....@xxxxxxxxx on 2015-03-02 21:06 GMT
- From: brailleblaster@xxxxxxxxxxxxxx
- To: brailleblaster@xxxxxxxxxxxxx
- Date: Mon, 02 Mar 2015 21:06:25 +0000
3 new revisions:
Revision: 92c6786483c4
Branch: default
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 16:05:02 2015 UTC
Log: after merging default with rt2138
https://code.google.com/p/brailleblaster/source/detail?r=92c6786483c4
Revision: f3463fb7d02f
Branch: rt2135-replaceAllAlert
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 16:06:27 2015 UTC
Log: after merging default
https://code.google.com/p/brailleblaster/source/detail?r=f3463fb7d02f
Revision: 2f50ed91ae47
Branch: rt2135-replaceAllAlert
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 21:05:55 2015 UTC
Log: work on search dialog
https://code.google.com/p/brailleblaster/source/detail?r=2f50ed91ae47
==============================================================================
Revision: 92c6786483c4
Branch: default
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 16:05:02 2015 UTC
Log: after merging default with rt2138
https://code.google.com/p/brailleblaster/source/detail?r=92c6786483c4
==============================================================================
Revision: f3463fb7d02f
Branch: rt2135-replaceAllAlert
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 16:06:27 2015 UTC
Log: after merging default
https://code.google.com/p/brailleblaster/source/detail?r=f3463fb7d02f
==============================================================================
Revision: 2f50ed91ae47
Branch: rt2135-replaceAllAlert
Author: Rebecca Luttmer <rebecca.luttmer@xxxxxxxxx>
Date: Mon Mar 2 21:05:55 2015 UTC
Log: work on search dialog
https://code.google.com/p/brailleblaster/source/detail?r=2f50ed91ae47
Modified:
/src/main/org/brailleblaster/search/SearchDialog.java
=======================================
--- /src/main/org/brailleblaster/search/SearchDialog.java Mon Mar 2
16:02:54 2015 UTC
+++ /src/main/org/brailleblaster/search/SearchDialog.java Mon Mar 2
21:05:55 2015 UTC
@@ -17,6 +17,7 @@
import org.brailleblaster.wordprocessor.WPManager;
import org.eclipse.swt.SWT;
import org.eclipse.swt.SWTException;
+import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Point;
@@ -47,6 +48,7 @@
protected Shell shlFindreplace;
private Shell errorMessageShell;
private Shell replaceAllShell;
+ private Shell newReplaceShell;
Display display = null;
private Manager man = null;
Combo searchCombo = null;
@@ -86,6 +88,7 @@
Map<String, String> replaceMap = new HashMap<String, String>();
private String foundStr;
int numberReplaceAlls;
+ Label label0, label;
/**
* Create the dialog.
@@ -171,7 +174,7 @@
// searches but within the
// same session
shlFindreplace = new Shell(getParent(), SWT.DIALOG_TRIM);
- // setPanelSize();
+ setPanelSize();
shlFindreplace.setText("Find/Replace");
shlFindreplace.setVisible(true);
@@ -226,6 +229,7 @@
if (replaceList != null) {
for (int i = 0; i < replaceArraySize; i++) {
replaceCombo.add(replaceList[i]);
+ replaceCombo.setText(replaceList[i].toString());
}// for
}// if
replaceCombo.addTraverseListener(new TraverseListener() {
@@ -541,6 +545,7 @@
man.getText().setCursorOffset(oldCursorPos);
}// do
while (replaceAll() == true);
+ replaceAllMessage();
}// if findStr==true
else {
createErrorMessage();
@@ -562,14 +567,13 @@
man.getText().setCursorOffset(oldCursorPos);
}// do
while (replaceAll() == true);
+ replaceAllMessage();
}// if findStr == true
else {
createErrorMessage();
}// else if nothing found
}// if searchBackward
- System.out.println("numberOfReplaces " +
numberReplaceAlls);
} // widgetSelected()
-
}); // replaceBtn.addSelectionListener()
Label label_3 = new Label(shlFindreplace, SWT.NONE);
@@ -604,7 +608,7 @@
private void createContents() {
shlFindreplace = new Shell(getParent(), SWT.DIALOG_TRIM);
- // setPanelSize();
+ setPanelSize();
shlFindreplace.setText("Find/Replace");
shlFindreplace.setVisible(true);
@@ -943,6 +947,7 @@
man.getText().setCursorOffset(oldCursorPos);
}// do
while (replaceAll() == true);
+ replaceAllMessage();
}// if findStr==true
else {
createErrorMessage();
@@ -964,13 +969,12 @@
man.getText().setCursorOffset(oldCursorPos);
}// do
while (replaceAll() == true);
+ replaceAllMessage();
}// if findStr == true
else {
createErrorMessage();
}// else if nothing found
}// if searchBackward
- System.out.println("numberOfReplaces " +
numberReplaceAlls);
- replaceAllMessage();
} // widgetSelected()
}); // replaceBtn.addSelectionListener()
@@ -1004,71 +1008,79 @@
display = getParent().getDisplay();
display.beep();
- if (errorMessageShell == null) {
+ if (errorMessageShell != null) {
+ errorMessageShell.close();
+ }
+ errorMessageShell = new Shell(display, SWT.DIALOG_TRIM);
- errorMessageShell = new Shell(display, SWT.DIALOG_TRIM);
+ errorMessageShell.setLayout(new GridLayout(1, true));
+ errorMessageShell.setText("Find/Replace Error");
+ errorMessageShell.setLocation(500, 250);
- errorMessageShell.setLayout(new GridLayout(1, true));
- errorMessageShell.setText("Find/Replace Error");
- errorMessageShell.setLocation(500, 250);
+ Label label = new Label(errorMessageShell, SWT.RESIZE);
+ label.setText("BrailleBlaster cannot find your word in the
document");
- Label label = new Label(errorMessageShell, SWT.RESIZE);
- label.setText("BrailleBlaster cannot find your word in the
document");
+ Button ok = new Button(errorMessageShell, SWT.NONE);
+ ok.setText("OK");
+ GridData errorMessageData = new GridData(SWT.HORIZONTAL);
+ ok.setLayoutData(errorMessageData);
+ ok.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ errorMessageShell.setVisible(false);
+ display.sleep();
+ searchCombo.setFocus();
+ }// widgetSelected
- Button ok = new Button(errorMessageShell, SWT.NONE);
- ok.setText("OK");
- GridData errorMessageData = new
GridData(SWT.HORIZONTAL);
- ok.setLayoutData(errorMessageData);
- ok.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- errorMessageShell.setVisible(false);
- display.sleep();
- searchCombo.setFocus();
- }// widgetSelected
-
- });// selectionListener
- errorMessageShell.pack(true);
- errorMessageShell.open();
-
- }// if null
- else {
- errorMessageShell.open();
- }
-
+ });// selectionListener
+ errorMessageShell.pack(true);
+ errorMessageShell.open();
+
+ errorMessageShell.addListener(SWT.Close, new Listener() {
+ public void handleEvent(Event event) {
+ event.doit = false;
+ errorMessageShell.setVisible(false);
+ }
+ });
}// createErrorMessage
private void replaceAllMessage() {
display = getParent().getDisplay();
display.beep();
- if (replaceAllShell == null) {
+ if (replaceAllShell != null) {
+ replaceAllShell.close();
+ }
- replaceAllShell = new Shell(display, SWT.DIALOG_TRIM);
+ replaceAllShell = new Shell(display, SWT.DIALOG_TRIM);
- replaceAllShell.setLayout(new GridLayout(1, true));
- replaceAllShell.setText("REPLACE ALL");
- replaceAllShell.setLocation(500, 250);
+ replaceAllShell.setLayout(new GridLayout(1, true));
+ replaceAllShell.setLocation(500, 250);
- Label label = new Label(replaceAllShell, SWT.RESIZE);
- label.setText("BrailleBlaster replaced "+numberReplaceAlls+"
words");
+ Label label0 = new Label(replaceAllShell, SWT.RESIZE);
+ label0.setText("Replace All Complete");
- Button ok = new Button(replaceAllShell, SWT.NONE);
- ok.setText("OK");
- GridData replaceAllData = new GridData(SWT.HORIZONTAL);
- ok.setLayoutData(replaceAllData);
- ok.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- replaceAllShell.setVisible(false);
- display.sleep();
- }// widgetSelected
+ Label label = new Label(replaceAllShell, SWT.RESIZE);
+ label.setText("BrailleBlaster replaced " + numberReplaceAlls + "
words");
- });// selectionListener
- replaceAllShell.pack(true);
- replaceAllShell.open();
+ Button ok = new Button(replaceAllShell, SWT.NONE);
+ ok.setText("OK");
+ GridData replaceAllData = new GridData(SWT.HORIZONTAL);
+ ok.setLayoutData(replaceAllData);
+ ok.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ replaceAllShell.setVisible(false);
+ display.sleep();
+ }// widgetSelected
- }// if null
- else {
- replaceAllShell.open();
- }
+ });// selectionListener
+ replaceAllShell.pack(true);
+ replaceAllShell.open();
+
+ replaceAllShell.addListener(SWT.Close, new Listener() {
+ public void handleEvent(Event event) {
+ event.doit = false;
+ replaceAllShell.setVisible(false);
+ }
+ });
}
public String[] getSearchList() {
@@ -1079,9 +1091,6 @@
return replaceList;
}// get replaceList
- // /////////////////////////////////////////////////////////////////
- // Searches document for string in our combo box.
- // Returns true if one was found.
public boolean replaceAll() {
// Grab text view.
TextView tv = man.getText();
@@ -2041,9 +2050,11 @@
// tests to see if the user has used the find button and has
selected
// text that they want to replace
+ if (foundStr!=null) {
if (foundStr.equals(findMeStr)) {
return true;
}// if text selected
+ }
// Get number of characters in text view.
int numChars = textStr.length();
Other related posts:
- » [brailleblaster] 3 new revisions pushed by rebecca....@xxxxxxxxx on 2015-03-02 21:06 GMT - brailleblaster
