Skip to content

Commit

Permalink
#79 Add Wrap Checkbox to Find Dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
deathmarine committed May 16, 2017
1 parent ea25dfc commit befd23f
Showing 1 changed file with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions src/us/deathmarine/luyten/FindBox.java
Expand Up @@ -31,6 +31,7 @@ public class FindBox extends JDialog {
JCheckBox regex;
JCheckBox wholew;
JCheckBox reverse;
JCheckBox wrap;
private JButton findButton;
JTextField textField;
private MainWindow mainWindow;
Expand Down Expand Up @@ -61,7 +62,8 @@ public FindBox(final MainWindow mainWindow) {
regex = new JCheckBox("Regex");
wholew = new JCheckBox("Whole Words");
reverse = new JCheckBox("Search Backwards");

wrap = new JCheckBox("Wrap");

findButton = new JButton("Find");
findButton.addActionListener(new FindButton());
this.getRootPane().setDefaultButton(findButton);
Expand All @@ -78,6 +80,7 @@ public FindBox(final MainWindow mainWindow) {
regex.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
wholew.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
reverse.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
wrap.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
final Dimension center = new Dimension((int) (screenSize.width * 0.35),
Expand All @@ -96,7 +99,7 @@ public FindBox(final MainWindow mainWindow) {
.addGroup(layout.createParallelGroup(Alignment.LEADING).addComponent(textField)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.LEADING).addComponent(mcase)
.addComponent(wholew))
.addComponent(wholew).addComponent(wrap))
.addGroup(layout.createParallelGroup(Alignment.LEADING).addComponent(regex)
.addComponent(reverse))))
.addGroup(layout.createParallelGroup(Alignment.LEADING).addComponent(findButton)));
Expand All @@ -110,7 +113,8 @@ public FindBox(final MainWindow mainWindow) {
.addGroup(layout.createParallelGroup(Alignment.BASELINE).addComponent(mcase)
.addComponent(regex))
.addGroup(layout.createParallelGroup(Alignment.BASELINE).addComponent(wholew)
.addComponent(reverse)))));
.addComponent(reverse))
.addGroup(layout.createParallelGroup(Alignment.BASELINE).addComponent(wrap)))));

this.adjustWindowPositionBySavedState();
this.setSaveWindowPositionOnClosing();
Expand Down Expand Up @@ -140,8 +144,12 @@ public void actionPerformed(ActionEvent event) {
context.setWholeWord(wholew.isSelected());

if (!SearchEngine.find(pane, context).wasFound()) {
pane.setSelectionStart(0);
pane.setSelectionEnd(0);
if(wrap.isSelected()){
pane.setSelectionStart(0);
pane.setSelectionEnd(0);
}else{
mainWindow.getLabel().setText("Search Complete");
}
}
}

Expand Down Expand Up @@ -207,8 +215,12 @@ public void actionPerformed(ActionEvent e) {
context.setWholeWord(wholew.isSelected());

if (!SearchEngine.find(pane, context).wasFound()) {
pane.setSelectionStart(0);
pane.setSelectionEnd(0);
if(wrap.isSelected()){
pane.setSelectionStart(0);
pane.setSelectionEnd(0);
}else{
mainWindow.getLabel().setText("Search Complete");
}
}

}
Expand Down

0 comments on commit befd23f

Please sign in to comment.