From 0bf696e62a405965f456668dc49ef44bded54407 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Mon, 28 Feb 2022 18:08:51 +0000 Subject: [PATCH] remove chat-from-contacts button and context menu --- .../com/muwire/gui/MainFrameController.groovy | 11 ----------- .../views/com/muwire/gui/MainFrameView.groovy | 7 ------- 2 files changed, 18 deletions(-) diff --git a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy index 926c6a4a..a6b4c3d9 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy @@ -471,17 +471,6 @@ class MainFrameController { view.showSearchWindow.call() } - @ControllerAction - void chatFromTrusted() { - int row = view.getSelectedContactsTableRow() - if (row < 0) - return - Persona p = model.contacts[row].persona - - startChat(p) - view.showChatWindow.call() - } - @ControllerAction void browseFromUpload(Uploader u) { Persona p = u.getDownloaderPersona() diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy index a82b30fc..2666c959 100644 --- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy @@ -671,8 +671,6 @@ class MainFrameView { enabled : bind {model.subscribeButtonEnabled}, subscribeAction) button(text : trans("MESSAGE_VERB"), toolTipText: trans("TOOLTIP_CONTACTS_MESSAGE"), enabled : bind {model.messageFromTrustedButtonEnabled}, messageFromTrustedAction) - button(text : trans("CHAT"), toolTipText: trans("TOOLTIP_CONTACTS_CHAT"), - enabled : bind {model.chatFromTrustedButtonEnabled}, chatFromTrustedAction) } } } @@ -2225,11 +2223,6 @@ class MainFrameView { browseCollectionsItem.addActionListener({ mvcGroup.controller.browseCollectionsFromTrusted() }) trustMenu.add(browseCollectionsItem) } - if (model.chatFromTrustedButtonEnabled) { - JMenuItem chatItem = new JMenuItem(trans("CHAT")) - chatItem.addActionListener({ mvcGroup.controller.chatFromTrusted() }) - trustMenu.add(chatItem) - } if (model.messageFromTrustedButtonEnabled) { JMenuItem messageItem = new JMenuItem(trans("MESSAGE_VERB")) messageItem.addActionListener({ mvcGroup.controller.messageFromTrusted() })