goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ctrl-W for closing tabs, Ctrl-R for repeating search

dbus-notify
Zlatin Balevsky 2022-03-13 15:20:43 +00:00
parent 9f1a48b2cc
commit b5469da8ef
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gui/griffon-app/views/com/muwire/gui/BrowseView.groovy
View File

@ -2,11 +2,14 @@ package com.muwire.gui
import griffon.core.artifact.GriffonView import griffon.core.artifact.GriffonView
import javax.swing.JComponent
import javax.swing.JPanel import javax.swing.JPanel
import javax.swing.JTable import javax.swing.JTable
import javax.swing.JTextField import javax.swing.JTextField
import javax.swing.JTree import javax.swing.JTree
import javax.swing.KeyStroke
import javax.swing.tree.TreePath import javax.swing.tree.TreePath
import java.awt.event.KeyEvent
import static com.muwire.gui.Translator.trans import static com.muwire.gui.Translator.trans
import griffon.inject.MVCMember import griffon.inject.MVCMember
@ -124,6 +127,10 @@ class BrowseView {
} }
} }
p.registerKeyboardAction(closeTab,
KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK),
JComponent.WHEN_IN_FOCUSED_WINDOW)
// right-click menu // right-click menu
def mouseListener = new MouseAdapter() { def mouseListener = new MouseAdapter() {
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e) {

10
gui/griffon-app/views/com/muwire/gui/CollectionTabView.groovy
View File

@ -1,6 +1,9 @@
package com.muwire.gui package com.muwire.gui
import javax.swing.JComponent
import javax.swing.KeyStroke
import javax.swing.tree.DefaultMutableTreeNode import javax.swing.tree.DefaultMutableTreeNode
import java.awt.event.KeyEvent
import static com.muwire.gui.Translator.trans import static com.muwire.gui.Translator.trans
import griffon.core.artifact.GriffonView import griffon.core.artifact.GriffonView
@ -38,7 +41,7 @@ class CollectionTabView {
CollectionTabController controller CollectionTabController controller
def parent def parent
def p JComponent p
JTable collectionsTable JTable collectionsTable
def lastCollectionsTableSortEvent def lastCollectionsTableSortEvent
@ -153,6 +156,11 @@ class CollectionTabView {
} }
} }
} }
p.registerKeyboardAction(closeTab,
KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK),
JComponent.WHEN_IN_FOCUSED_WINDOW)
} }
boolean isSequentialCollection() { boolean isSequentialCollection() {

13
gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy
View File

@ -6,8 +6,10 @@ import griffon.core.artifact.GriffonView
import javax.swing.JPanel import javax.swing.JPanel
import javax.swing.JTabbedPane import javax.swing.JTabbedPane
import javax.swing.JTextField import javax.swing.JTextField
import javax.swing.KeyStroke
import javax.swing.tree.TreePath import javax.swing.tree.TreePath
import java.awt.Component import java.awt.Component
import java.awt.event.KeyEvent
import java.util.stream.Collectors import java.util.stream.Collectors
import static com.muwire.gui.Translator.trans import static com.muwire.gui.Translator.trans
@ -54,7 +56,7 @@ class SearchTabView {
UISettings settings UISettings settings
Component pane JComponent pane
JTabbedPane parent JTabbedPane parent
String searchTerms String searchTerms
JTable sendersTable JTable sendersTable
@ -237,6 +239,15 @@ class SearchTabView {
this.pane.putClientProperty("results-table",resultsTable) this.pane.putClientProperty("results-table",resultsTable)
pane.putClientProperty("focusListener", new FocusListener()) pane.putClientProperty("focusListener", new FocusListener())
pane.with {
registerKeyboardAction(closeTab,
KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK),
WHEN_IN_FOCUSED_WINDOW)
registerKeyboardAction(repeatSearch,
KeyStroke.getKeyStroke(KeyEvent.VK_R, KeyEvent.CTRL_DOWN_MASK),
WHEN_IN_FOCUSED_WINDOW)
}
} }
void mvcGroupInit(Map<String, String> args) { void mvcGroupInit(Map<String, String> args) {