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

organize shared files menu better

dbus-notify
Zlatin Balevsky 2022-08-07 15:06:56 +01:00
parent b83e85b8b4
commit c82c92a7a2
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/griffon-app/i18n/messages.properties
View File

@ -242,6 +242,7 @@ COMMENT_SELECTED_FILES=Comment selected files
CERTIFY_SELECTED_FILES=Certify selected files CERTIFY_SELECTED_FILES=Certify selected files
OPEN_CONTAINING_FOLDER=Open containing folder OPEN_CONTAINING_FOLDER=Open containing folder
SHOW_FILE_DETAILS=Show file details SHOW_FILE_DETAILS=Show file details
OTHER_ACTIONS=Other actions
# Incoming searches table popup menu # Incoming searches table popup menu
COPY_SEARCH_TO_CLIPBOARD=Copy search to clipboard COPY_SEARCH_TO_CLIPBOARD=Copy search to clipboard

41
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@ -20,6 +20,7 @@ import javax.swing.AbstractAction
import javax.swing.Action import javax.swing.Action
import javax.swing.DropMode import javax.swing.DropMode
import javax.swing.JButton import javax.swing.JButton
import javax.swing.JMenu
import javax.swing.JPanel import javax.swing.JPanel
import javax.swing.JTabbedPane import javax.swing.JTabbedPane
import javax.swing.JTextField import javax.swing.JTextField
@ -1884,37 +1885,51 @@ class MainFrameView {
JMenuItem openFile = new JMenuItem(trans("OPEN")) JMenuItem openFile = new JMenuItem(trans("OPEN"))
openFile.addActionListener({mvcGroup.controller.open()}) openFile.addActionListener({mvcGroup.controller.open()})
sharedFilesMenu.add(openFile) sharedFilesMenu.add(openFile)
JMenuItem openContainingFolder = new JMenuItem(trans("OPEN_CONTAINING_FOLDER"))
openContainingFolder.addActionListener({mvcGroup.controller.openContainingFolder()})
sharedFilesMenu.add(openContainingFolder)
sharedFilesMenu.addSeparator()
JMenuItem copyLinkToClipboard = new JMenuItem(trans("COPY_LINK_TO_CLIPBOARD")) JMenuItem copyLinkToClipboard = new JMenuItem(trans("COPY_LINK_TO_CLIPBOARD"))
copyLinkToClipboard.addActionListener({mvcGroup.view.copyLinkToClipboard()}) copyLinkToClipboard.addActionListener({mvcGroup.view.copyLinkToClipboard()})
sharedFilesMenu.add(copyLinkToClipboard) sharedFilesMenu.add(copyLinkToClipboard)
JMenuItem copyHashToClipboard = new JMenuItem(trans("COPY_HASH_TO_CLIPBOARD"))
copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard()})
sharedFilesMenu.add(copyHashToClipboard)
sharedFilesMenu.addSeparator()
} }
JMenuItem copyHashToClipboard = new JMenuItem(trans("COPY_HASH_TO_CLIPBOARD"))
copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard()})
sharedFilesMenu.add(copyHashToClipboard)
JMenuItem createCollection = new JMenuItem(trans("CREATE_COLLECTION"))
createCollection.addActionListener({mvcGroup.controller.collection()})
sharedFilesMenu.add(createCollection)
JMenuItem unshareSelectedFiles = new JMenuItem(trans("UNSHARE_SELECTED_FILES")) JMenuItem unshareSelectedFiles = new JMenuItem(trans("UNSHARE_SELECTED_FILES"))
unshareSelectedFiles.addActionListener({mvcGroup.controller.unshareSelectedFile()}) unshareSelectedFiles.addActionListener({mvcGroup.controller.unshareSelectedFile()})
sharedFilesMenu.add(unshareSelectedFiles) sharedFilesMenu.add(unshareSelectedFiles)
sharedFilesMenu.addSeparator()
JMenu otherActionsMenu = new JMenu(trans("OTHER_ACTIONS"))
JMenuItem createCollection = new JMenuItem(trans("CREATE_COLLECTION"))
createCollection.addActionListener({mvcGroup.controller.collection()})
otherActionsMenu.add(createCollection)
JMenuItem commentSelectedFiles = new JMenuItem(trans("COMMENT_SELECTED_FILES")) JMenuItem commentSelectedFiles = new JMenuItem(trans("COMMENT_SELECTED_FILES"))
commentSelectedFiles.addActionListener({mvcGroup.controller.addComment()}) commentSelectedFiles.addActionListener({mvcGroup.controller.addComment()})
sharedFilesMenu.add(commentSelectedFiles) otherActionsMenu.add(commentSelectedFiles)
JMenuItem certifySelectedFiles = new JMenuItem(trans("CERTIFY_SELECTED_FILES")) JMenuItem certifySelectedFiles = new JMenuItem(trans("CERTIFY_SELECTED_FILES"))
certifySelectedFiles.addActionListener({mvcGroup.controller.issueCertificate()}) certifySelectedFiles.addActionListener({mvcGroup.controller.issueCertificate()})
sharedFilesMenu.add(certifySelectedFiles) otherActionsMenu.add(certifySelectedFiles)
JMenuItem openContainingFolder = new JMenuItem(trans("OPEN_CONTAINING_FOLDER"))
openContainingFolder.addActionListener({mvcGroup.controller.openContainingFolder()}) sharedFilesMenu.add(otherActionsMenu)
sharedFilesMenu.add(openContainingFolder)
if (singleSelectedFile != null) { if (singleSelectedFile != null) {
sharedFilesMenu.addSeparator()
JMenuItem showFileDetails = new JMenuItem(trans("SHOW_FILE_DETAILS")) JMenuItem showFileDetails = new JMenuItem(trans("SHOW_FILE_DETAILS"))
showFileDetails.addActionListener({ mvcGroup.controller.showFileDetails() }) showFileDetails.addActionListener({ mvcGroup.controller.showFileDetails() })
sharedFilesMenu.add(showFileDetails) sharedFilesMenu.add(showFileDetails)
} else if (selectedFolders.size() == 1 && model.core.getWatchedDirectoryManager().isWatched(selectedFolders.first())) { } else if (selectedFolders.size() == 1 && model.core.getWatchedDirectoryManager().isWatched(selectedFolders.first())) {
sharedFilesMenu.addSeparator()
JMenuItem configure = new JMenuItem(trans("CONFIGURE")) JMenuItem configure = new JMenuItem(trans("CONFIGURE"))
configure.addActionListener({mvcGroup.controller.configureFolder()}) configure.addActionListener({mvcGroup.controller.configureFolder()})
sharedFilesMenu.add(configure) sharedFilesMenu.add(configure)