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

add Close buttons to all tools, make rule text field larger

pull/53/head
Zlatin Balevsky 2020-10-11 16:31:06 +01:00
parent fca3478698
commit 01c9c0ee1c
No known key found for this signature in database
GPG Key ID: A72832072D525E41
8 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/griffon-app/controllers/com/muwire/gui/AdvancedSharingController.groovy
View File

@ -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()
}
}

6
gui/griffon-app/controllers/com/muwire/gui/CertificateControlController.groovy
View File

@ -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()
}
}

8
gui/griffon-app/controllers/com/muwire/gui/ChatMonitorController.groovy
View File

@ -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()
}
}

6
gui/griffon-app/controllers/com/muwire/gui/ContentPanelController.groovy
View File

@ -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()
}

1
gui/griffon-app/views/com/muwire/gui/AdvancedSharingView.groovy
View File

@ -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)
}
}

1
gui/griffon-app/views/com/muwire/gui/CertificateControlView.groovy
View File

@ -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)
}
}
}

3
gui/griffon-app/views/com/muwire/gui/ChatMonitorView.groovy
View File

@ -44,6 +44,9 @@ class ChatMonitorView {
}
}
}
panel(constraints : BorderLayout.SOUTH) {
button(text : trans("CLOSE"), closeAction)
}
}
}

3
gui/griffon-app/views/com/muwire/gui/ContentPanelView.groovy
View File

@ -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)
}
}
}