Re-enable the enter key to search ability.

This commit is contained in:
Samuel H. Kenyon 2014-03-06 13:41:57 -05:00
parent ccb15a338a
commit 427a99fb30
2 changed files with 33 additions and 13 deletions

View File

@ -118,6 +118,10 @@
<Dimension value="[2, 25]"/> <Dimension value="[2, 25]"/>
</Property> </Property>
</Properties> </Properties>
<Events>
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="keywordTextFieldMouseClicked"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="keywordTextFieldActionPerformed"/>
</Events>
</Component> </Component>
<Component class="javax.swing.JButton" name="searchButton"> <Component class="javax.swing.JButton" name="searchButton">
<Properties> <Properties>

View File

@ -181,6 +181,16 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
keywordTextField.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(192, 192, 192), 1, true)); keywordTextField.setBorder(new javax.swing.border.LineBorder(new java.awt.Color(192, 192, 192), 1, true));
keywordTextField.setMinimumSize(new java.awt.Dimension(2, 25)); keywordTextField.setMinimumSize(new java.awt.Dimension(2, 25));
keywordTextField.setPreferredSize(new java.awt.Dimension(2, 25)); keywordTextField.setPreferredSize(new java.awt.Dimension(2, 25));
keywordTextField.addMouseListener(new java.awt.event.MouseAdapter() {
public void mouseClicked(java.awt.event.MouseEvent evt) {
keywordTextFieldMouseClicked(evt);
}
});
keywordTextField.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
keywordTextFieldActionPerformed(evt);
}
});
searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N searchButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/keywordsearch/search-icon.png"))); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(searchButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.searchButton.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(searchButton, org.openide.util.NbBundle.getMessage(DropdownSearchPanel.class, "DropdownSearchPanel.searchButton.text")); // NOI18N
@ -239,6 +249,24 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
keywordTextFieldActionPerformed(evt); keywordTextFieldActionPerformed(evt);
}//GEN-LAST:event_searchButtonActionPerformed }//GEN-LAST:event_searchButtonActionPerformed
private void keywordTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_keywordTextFieldActionPerformed
// if (!entered) {
// return;
// }
//getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
search();
} finally {
//getRootPane().setCursor(null);
}
}//GEN-LAST:event_keywordTextFieldActionPerformed
private void keywordTextFieldMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_keywordTextFieldMouseClicked
if(evt.isPopupTrigger()) {
rightClickMenu.show(evt.getComponent(), evt.getX(), evt.getY());
}
}//GEN-LAST:event_keywordTextFieldMouseClicked
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JMenuItem copyMenuItem; private javax.swing.JMenuItem copyMenuItem;
private javax.swing.JMenuItem cutMenuItem; private javax.swing.JMenuItem cutMenuItem;
@ -253,17 +281,5 @@ public class DropdownSearchPanel extends AbstractKeywordSearchPerformer {
private javax.swing.JRadioButton substringRadioButton; private javax.swing.JRadioButton substringRadioButton;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
private void keywordTextFieldActionPerformed(java.awt.event.ActionEvent evt) {
// if (!entered) {
// return;
// }
//getRootPane().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
try {
search();
} finally {
//getRootPane().setCursor(null);
}
}
} }