Unify the right-click menu code for the different result views. Disable download on double click from the tree view because it interferes with folder expansion

auto-update
Zlatin Balevsky 2021-10-11 15:15:28 +01:00
parent c83ab6acd4
commit f49732ef99
No known key found for this signature in database
GPG Key ID: A72832072D525E41
1 changed files with 13 additions and 15 deletions

View File

@ -332,9 +332,11 @@ class SearchTabView {
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
if (e.button == MouseEvent.BUTTON3) if (e.button == MouseEvent.BUTTON3)
showPopupMenu(e) showPopupMenu(e)
else if (e.button == MouseEvent.BUTTON1 && e.clickCount == 2) else if (e.button == MouseEvent.BUTTON1 && e.clickCount == 2) {
if (model.groupedByFile || !model.treeVisible)
controller.download() controller.download()
} }
}
@Override @Override
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e) {
if (e.button == MouseEvent.BUTTON3) if (e.button == MouseEvent.BUTTON3)
@ -465,15 +467,7 @@ class SearchTabView {
sendersTable2.selectionModel.setSelectionInterval(selectedRow,selectedRow) sendersTable2.selectionModel.setSelectionInterval(selectedRow,selectedRow)
}) })
resultsTable2.addMouseListener(new MouseAdapter() { resultsTable2.addMouseListener(resultsMouseListener)
@Override
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() > 1 && e.button == MouseEvent.BUTTON1)
mvcGroup.controller.download()
}
})
// TODO: add download right-click action
// senders table 2 // senders table 2
sendersTable2.addMouseListener(sendersMouseListener) sendersTable2.addMouseListener(sendersMouseListener)
@ -537,10 +531,14 @@ class SearchTabView {
} }
boolean singleSelected boolean singleSelected
if (model.groupedByFile)
singleSelected = true
else {
if (model.treeVisible) if (model.treeVisible)
singleSelected = resultTree.singleResultSelected() != null singleSelected = resultTree.singleResultSelected() != null
else else
singleSelected = resultsTable.getSelectedRows().length == 1 singleSelected = resultsTable.getSelectedRows().length == 1
}
if (singleSelected) { if (singleSelected) {
JMenuItem copyHashToClipboard = new JMenuItem(trans("COPY_HASH_TO_CLIPBOARD")) JMenuItem copyHashToClipboard = new JMenuItem(trans("COPY_HASH_TO_CLIPBOARD"))
copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard()}) copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard()})