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

use a combo box for font selection GitHub issue #83

auto-update
Zlatin Balevsky 2021-10-14 12:41:37 +01:00
parent ced3c23e53
commit 99d20c046c
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy
View File

@ -272,7 +272,7 @@ class OptionsController {
text = "metal"
uiSettings.lnf = text
text = view.fontField.text
text = view.fontComboBox.getSelectedItem()
model.font = text
uiSettings.font = text

3
gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy
View File

@ -8,6 +8,7 @@ import griffon.transform.Observable
import griffon.metadata.ArtifactProviderFor
import java.awt.Font
import java.awt.GraphicsEnvironment
@ArtifactProviderFor(GriffonModel)
class OptionsModel {
@ -46,6 +47,7 @@ class OptionsModel {
@Observable boolean darculaLnf
@Observable boolean metalLnf
@Observable String font
String [] availableFonts
@Observable boolean automaticFontSize
@Observable int customFontSize
@Observable boolean fontStyleBold
@ -136,6 +138,7 @@ class OptionsModel {
else
systemLnf = true
font = uiSettings.font
availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames()
automaticFontSize = uiSettings.autoFontSize
customFontSize = uiSettings.fontSize
fontStyleBold = (uiSettings.fontStyle & Font.BOLD) == Font.BOLD

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

@ -3,6 +3,8 @@ package com.muwire.gui
import griffon.core.artifact.GriffonView
import net.i2p.util.SystemVersion
import javax.swing.JComboBox
import static com.muwire.gui.Translator.trans
import griffon.inject.MVCMember
import griffon.metadata.ArtifactProviderFor
@ -72,7 +74,7 @@ class OptionsView {
def useUPNPCheckbox
def monitorCheckbox
def fontField
def fontComboBox
def fontSizeField
def fontStyleBoldCheckbox
def fontStyleItalicCheckbox
@ -120,6 +122,19 @@ class OptionsView {
mainFrame = application.windowManager.findWindow("main-frame")
d = new JDialog(mainFrame, "Options", true)
d.setResizable(false)
fontComboBox = new JComboBox<String>(model.availableFonts)
int fontIdx = -1
for (int i = 0; i < model.availableFonts.length; i++) {
if (model.font == model.availableFonts[i]) {
fontIdx = i
break
}
}
if (fontIdx < 0)
fontIdx = 0 // hmm
fontComboBox.setSelectedIndex(fontIdx)
p = builder.panel {
gridBagLayout()
panel (border : titledBorder(title : trans("OPTIONS_SEARCH_SETTINGS"), border : etchedBorder(), titlePosition : TitledBorder.TOP),
@ -276,7 +291,7 @@ class OptionsView {
radioButton(text: "Metal", selected : bind {model.metalLnf}, buttonGroup : lnfGroup,
constraints: gbc(gridx: 3, gridy:0, anchor: GridBagConstraints.LINE_START), metalLnfAction)
label(text : trans("OPTIONS_FONT"), constraints : gbc(gridx: 0, gridy : 1, anchor : GridBagConstraints.LINE_START, weightx: 100))
fontField = textField(text : bind {model.font}, columns : COLUMNS, constraints : gbc(gridx : 3, gridy:1, anchor : GridBagConstraints.LINE_START))
widget(fontComboBox, constraints : gbc(gridx : 1, gridy:1, gridwidth: 3, anchor : GridBagConstraints.LINE_START))
label(text : trans("OPTIONS_FONT_SIZE"), constraints : gbc(gridx: 0, gridy : 2, anchor : GridBagConstraints.LINE_START, weightx : 100))
buttonGroup(id: "fontSizeGroup")