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

Fix right-click menu options when uploads are cleared automatically. GitHub issue #86

auto-update
Zlatin Balevsky 2021-10-14 18:31:55 +01:00
parent 6695cb1390
commit 189803e27a
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy
View File

@ -445,10 +445,7 @@ class MainFrameController {
}
@ControllerAction
void browseFromUpload() {
Uploader u = view.selectedUploader()
if (u == null)
return
void browseFromUpload(Uploader u) {
Persona p = u.getDownloaderPersona()
String groupId = UUID.randomUUID().toString()
@ -460,10 +457,7 @@ class MainFrameController {
}
@ControllerAction
void browseCollectionsFromUpload() {
Uploader u = view.selectedUploader()
if (u == null)
return
void browseCollectionsFromUpload(Uploader u) {
Persona p = u.getDownloaderPersona()
UUID uuid = UUID.randomUUID()
@ -479,10 +473,7 @@ class MainFrameController {
}
@ControllerAction
void subscribeFromUpload() {
Uploader u = view.selectedUploader()
if (u == null)
return
void subscribeFromUpload(Uploader u) {
Persona p = u.getDownloaderPersona()
Feed feed = new Feed(p)
@ -496,10 +487,7 @@ class MainFrameController {
}
@ControllerAction
void chatFromUpload() {
Uploader u = view.selectedUploader()
if (u == null)
return
void chatFromUpload(Uploader u) {
Persona p = u.getDownloaderPersona()
startChat(p)
view.showChatWindow.call()
@ -569,10 +557,7 @@ class MainFrameController {
}
@ControllerAction
void showInLibrary() {
Uploader uploader = view.selectedUploader()
if (uploader == null)
return
void showInLibrary(Uploader uploader) {
SharedFile sf = null
if (uploader instanceof HashListUploader) {
InfoHash infoHash = uploader.infoHash
@ -900,10 +885,7 @@ class MainFrameController {
}
@ControllerAction
void messageComposeFromUpload() {
Uploader u = view.selectedUploader()
if (u == null)
return
void messageComposeFromUpload(Uploader u) {
Persona p = u.getDownloaderPersona()
def params = [:]
@ -926,10 +908,7 @@ class MainFrameController {
}
@ControllerAction
void copyIdFromUploads() {
Uploader u = view.selectedUploader()
if (u == null)
return
void copyIdFromUploads(Uploader u) {
CopyPasteSupport.copyToClipboard(u.getDownloaderPersona().toBase64())
}

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

@ -1618,38 +1618,38 @@ class MainFrameView {
JPopupMenu uploadsTableMenu = new JPopupMenu()
JMenuItem showInLibrary = new JMenuItem(trans("SHOW_IN_LIBRARY"))
showInLibrary.addActionListener({mvcGroup.controller.showInLibrary()})
showInLibrary.addActionListener({mvcGroup.controller.showInLibrary(uploader)})
uploadsTableMenu.add(showInLibrary)
if (uploader.isBrowseEnabled()) {
JMenuItem browseItem = new JMenuItem(trans("BROWSE_HOST"))
browseItem.addActionListener({mvcGroup.controller.browseFromUpload()})
browseItem.addActionListener({mvcGroup.controller.browseFromUpload(uploader)})
uploadsTableMenu.add(browseItem)
JMenuItem browseCollectionsItem = new JMenuItem(trans("BROWSE_COLLECTIONS"))
browseCollectionsItem.addActionListener({mvcGroup.controller.browseCollectionsFromUpload()})
browseCollectionsItem.addActionListener({mvcGroup.controller.browseCollectionsFromUpload(uploader)})
uploadsTableMenu.add(browseCollectionsItem)
}
if (uploader.isFeedEnabled() && mvcGroup.controller.core.feedManager.getFeed(uploader.getDownloaderPersona()) == null) {
JMenuItem feedItem = new JMenuItem(trans("SUBSCRIBE"))
feedItem.addActionListener({mvcGroup.controller.subscribeFromUpload()})
feedItem.addActionListener({mvcGroup.controller.subscribeFromUpload(uploader)})
uploadsTableMenu.add(feedItem)
}
if (uploader.isChatEnabled() && !mvcGroup.controller.core.chatManager.isConnected(uploader.getDownloaderPersona())) {
JMenuItem chatItem = new JMenuItem(trans("CHAT"))
chatItem.addActionListener({mvcGroup.controller.chatFromUpload()})
chatItem.addActionListener({mvcGroup.controller.chatFromUpload(uploader)})
uploadsTableMenu.add(chatItem)
}
if (uploader.isMessageEnabled()) {
JMenuItem messageItem = new JMenuItem(trans("MESSAGE_VERB"))
messageItem.addActionListener({mvcGroup.controller.messageComposeFromUpload()})
messageItem.addActionListener({mvcGroup.controller.messageComposeFromUpload(uploader)})
uploadsTableMenu.add(messageItem)
}
JMenuItem copyIDItem = new JMenuItem(trans("COPY_FULL_ID"))
copyIDItem.addActionListener({mvcGroup.controller.copyIdFromUploads()})
copyIDItem.addActionListener({mvcGroup.controller.copyIdFromUploads(uploader)})
uploadsTableMenu.add(copyIDItem)
showPopupMenu(uploadsTableMenu, e)