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

add contact selector for custom contacts visibility type

dbus-notify
Zlatin Balevsky 2022-05-04 19:15:10 +01:00
parent d889a12a43
commit 5fcc3a0b88
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gui/griffon-app/controllers/com/muwire/gui/WatchedDirectoryController.groovy
View File

@ -22,7 +22,8 @@ class WatchedDirectoryController {
autoWatch : view.autoWatchCheckbox.model.isSelected(),
syncInterval : Integer.parseInt(view.syncIntervalField.text),
subfolders: view.applySubCheckbox.model.isSelected(),
visibility: model.visibility)
visibility: model.visibility,
customVisibility: view.contactSelector.model.contacts)
model.core.eventBus.publish(event)
cancel()
}

4
gui/griffon-app/models/com/muwire/gui/WatchedDirectoryModel.groovy
View File

@ -1,6 +1,7 @@
package com.muwire.gui
import com.muwire.core.Core
import com.muwire.core.Persona
import com.muwire.core.files.directories.Visibility
import com.muwire.core.files.directories.WatchedDirectory
@ -16,10 +17,13 @@ class WatchedDirectoryModel {
@Observable boolean autoWatch
@Observable int syncInterval
@Observable Visibility visibility
Set<Persona> allowedContacts = new HashSet<>()
void mvcGroupInit(Map<String,String> args) {
autoWatch = directory.autoWatch
syncInterval = directory.syncInterval
visibility = directory.visibility
if (directory.customVisibility != null)
allowedContacts.addAll(directory.customVisibility)
}
}

19
gui/griffon-app/views/com/muwire/gui/WatchedDirectoryView.groovy
View File

@ -3,6 +3,7 @@ package com.muwire.gui
import com.muwire.core.files.directories.Visibility
import griffon.core.artifact.GriffonView
import griffon.core.mvc.MVCGroup
import javax.swing.JFrame
import javax.swing.border.TitledBorder
@ -36,9 +37,15 @@ class WatchedDirectoryView {
def syncIntervalField
def applySubCheckbox
MVCGroup contactSelector
void initUI() {
mainFrame = application.windowManager.findWindow("main-frame")
def params = [:]
params.contacts = model.allowedContacts
contactSelector = mvcGroup.createMVCGroup("contact-selector", UUID.randomUUID().toString(), params)
window = builder.frame(visible: false, defaultCloseOperation: JFrame.DISPOSE_ON_CLOSE,
iconImage: builder.imageIcon("/MuWire-48x48.png").image,
title: trans("WATCHED_DIRECTORY_CONFIGURATION")) {
@ -47,7 +54,7 @@ class WatchedDirectoryView {
label(trans("WATCHED_DIRECTORY_CONFIGURATION_FOR",model.directory.directory.toString()))
}
panel (constraints : BorderLayout.CENTER) {
gridLayout(rows: 2, cols: 1)
gridLayout(rows: 3, cols: 1)
panel(border: titledBorder(title: trans("WATCHED_DIRECTORY_SYNC_CONFIG"), border: etchedBorder(),
titlePosition: TitledBorder.TOP)) {
gridBagLayout()
@ -74,6 +81,7 @@ class WatchedDirectoryView {
selected: bind { model.visibility == Visibility.CUSTOM },
buttonGroup : visibilityGroup, actionPerformed : actionCustom)
}
widget(contactSelector.view.component)
}
panel (constraints : BorderLayout.SOUTH) {
gridLayout(rows: 1, cols: 3)
@ -94,6 +102,8 @@ class WatchedDirectoryView {
autoWatchCheckbox.addChangeListener({e ->
model.autoWatch = autoWatchCheckbox.model.isSelected()
} as ChangeListener)
contactSelector.view.component.setEnabled(model.visibility == Visibility.CUSTOM)
window.addWindowListener( new WindowAdapter() {
void windowClosed(WindowEvent event) {
@ -105,15 +115,22 @@ class WatchedDirectoryView {
window.setVisible(true)
}
void mvcGroupDestroy() {
contactSelector?.destroy()
}
def actionEveryone = {
contactSelector.view.component.setEnabled(false)
model.visibility = Visibility.EVERYONE
}
def actionContacts = {
contactSelector.view.component.setEnabled(false)
model.visibility = Visibility.CONTACTS
}
def actionCustom = {
contactSelector.view.component.setEnabled(true)
model.visibility = Visibility.CUSTOM
}
}