From 01c9c0ee1c13cd3ac115fed90cebc36b512bf948 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Sun, 11 Oct 2020 16:31:06 +0100 Subject: [PATCH] add Close buttons to all tools, make rule text field larger --- .../com/muwire/gui/AdvancedSharingController.groovy | 6 ++++++ .../com/muwire/gui/CertificateControlController.groovy | 6 ++++++ .../com/muwire/gui/ChatMonitorController.groovy | 8 +++++++- .../com/muwire/gui/ContentPanelController.groovy | 6 ++++++ .../views/com/muwire/gui/AdvancedSharingView.groovy | 1 + .../views/com/muwire/gui/CertificateControlView.groovy | 1 + .../views/com/muwire/gui/ChatMonitorView.groovy | 3 +++ .../views/com/muwire/gui/ContentPanelView.groovy | 3 ++- 8 files changed, 32 insertions(+), 2 deletions(-) diff --git a/gui/griffon-app/controllers/com/muwire/gui/AdvancedSharingController.groovy b/gui/griffon-app/controllers/com/muwire/gui/AdvancedSharingController.groovy index 0b3126e5..e40d9fd4 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/AdvancedSharingController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/AdvancedSharingController.groovy @@ -36,4 +36,10 @@ class AdvancedSharingController { def event = new UISyncDirectoryEvent(directory : wd.directory) model.core.eventBus.publish(event) } + + @ControllerAction + void close() { + view.dialog.setVisible(false) + mvcGroup.destroy() + } } \ No newline at end of file diff --git a/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy b/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy index d41d1ce2..534167b6 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy @@ -25,4 +25,10 @@ class CertificateControlController { params['text'] = cert.comment.name mvcGroup.createMVCGroup("show-comment", params) } + + @ControllerAction + void close() { + view.dialog.setVisible(false) + mvcGroup.destroy() + } } \ No newline at end of file diff --git a/gui/griffon-app/controllers/com/muwire/gui/ChatMonitorController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ChatMonitorController.groovy index a37ef85a..8c11d22d 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/ChatMonitorController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/ChatMonitorController.groovy @@ -9,5 +9,11 @@ import javax.annotation.Nonnull @ArtifactProviderFor(GriffonController) class ChatMonitorController { @MVCMember @Nonnull - ChatMonitorModel model + ChatMonitorView view + + @ControllerAction + void close() { + view.window.setVisible(false) + mvcGroup.destroy() + } } \ No newline at end of file diff --git a/gui/griffon-app/controllers/com/muwire/gui/ContentPanelController.groovy b/gui/griffon-app/controllers/com/muwire/gui/ContentPanelController.groovy index 5654e809..e78cdde4 100644 --- a/gui/griffon-app/controllers/com/muwire/gui/ContentPanelController.groovy +++ b/gui/griffon-app/controllers/com/muwire/gui/ContentPanelController.groovy @@ -99,6 +99,12 @@ class ContentPanelController { core.eventBus.publish(new TrustEvent(persona : m.persona, level : TrustLevel.DISTRUSTED, reason : reason)) } + @ControllerAction + void close() { + view.dialog.setVisible(false) + mvcGroup.destroy() + } + void saveMuWireSettings() { core.saveMuSettings() } diff --git a/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy b/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy index 9ef175ac..bc535588 100644 --- a/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy @@ -67,6 +67,7 @@ class AdvancedSharingView { panel (constraints : BorderLayout.SOUTH) { button(text : trans("CONFIGURE"), enabled : bind{model.configureActionEnabled}, configureAction) button(text : trans("SYNC"), enabled : bind{model.syncActionEnabled}, syncAction) + button(text : trans("CLOSE"), closeAction) } } diff --git a/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy b/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy index b17602bf..288bf8be 100644 --- a/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy @@ -73,6 +73,7 @@ class CertificateControlView { } panel (constraints : BorderLayout.SOUTH) { button(text : trans("VIEW_COMMENT"), enabled : bind {model.showCommentActionEnabled}, showCommentAction) + button(text : trans("CLOSE"), closeAction) } } } diff --git a/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy b/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy index ed88e132..dcec22d6 100644 --- a/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy @@ -44,6 +44,9 @@ class ChatMonitorView { } } } + panel(constraints : BorderLayout.SOUTH) { + button(text : trans("CLOSE"), closeAction) + } } } diff --git a/gui/griffon-app/views/com/muwire/gui/ContentPanelView.groovy b/gui/griffon-app/views/com/muwire/gui/ContentPanelView.groovy index e5ff5b69..ec6a2ba6 100644 --- a/gui/griffon-app/views/com/muwire/gui/ContentPanelView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/ContentPanelView.groovy @@ -60,13 +60,14 @@ class ContentPanelView { } panel (constraints : BorderLayout.SOUTH) { borderLayout() - ruleTextField = textField(constraints: BorderLayout.CENTER, action: addRuleAction) + ruleTextField = textField(constraints: BorderLayout.CENTER, columns : 20, action: addRuleAction) panel (constraints: BorderLayout.EAST) { buttonGroup(id : "ruleType") radioButton(text: trans("KEYWORD"), selected : true, buttonGroup: ruleType, keywordAction) radioButton(text: trans("REGEX"), selected : false, buttonGroup: ruleType, regexAction) button(text : trans("ADD_RULE"), addRuleAction) button(text : trans("DELETE_RULE"), enabled : bind {model.deleteButtonEnabled}, deleteRuleAction) + button(text : trans("CLOSE"), closeAction) } } }