From 2b8a813b21032290c4ee629cb1f961305093e093 Mon Sep 17 00:00:00 2001 From: Per Nyfelt Date: Fri, 13 Nov 2026 15:19:14 +0100 Subject: [PATCH 1/5] =?UTF-8?q?F=C3=B6rb=C3=A4ttra=20verifikationsverktygs?= =?UTF-8?q?f=C3=A4ltet=20med=20SVG-ikoner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipsa/accounting/ui/VoucherPanel.groovy | 107 ++++++++++-------- .../accounting/ui/VoucherSaveIcon.groovy | 34 ------ .../accounting/ui/VoucherToolbar.groovy | 61 ++++++++++ .../main/resources/i18n/messages.properties | 4 +- .../resources/i18n/messages_sv.properties | 4 +- .../icons/voucher/LICENSE-lucide.txt | 15 +++ .../main/resources/icons/voucher/calendar.svg | 13 +++ .../resources/icons/voucher/correction.svg | 6 + .../resources/icons/voucher/duplicate.svg | 5 + .../main/resources/icons/voucher/first.svg | 5 + app/src/main/resources/icons/voucher/last.svg | 5 + .../icons/voucher/new-after-save.svg | 7 ++ .../resources/icons/voucher/new-series.svg | 5 + app/src/main/resources/icons/voucher/next.svg | 4 + app/src/main/resources/icons/voucher/prev.svg | 4 + .../main/resources/icons/voucher/print.svg | 6 + app/src/main/resources/icons/voucher/save.svg | 6 + app/src/main/resources/icons/voucher/void.svg | 8 ++ .../ui/VoucherPanelNavigationTest.groovy | 13 +-- .../accounting/ui/VoucherToolbarTest.groovy | 64 +++++++++++ .../issue-125/voucher-toolbar-dark.png | Bin 0 -> 11985 bytes .../issue-125/voucher-toolbar-light.png | Bin 0 -> 12322 bytes 22 files changed, 281 insertions(+), 95 deletions(-) delete mode 100644 app/src/main/groovy/se/alipsa/accounting/ui/VoucherSaveIcon.groovy create mode 100644 app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy create mode 100644 app/src/main/resources/icons/voucher/LICENSE-lucide.txt create mode 100644 app/src/main/resources/icons/voucher/calendar.svg create mode 100644 app/src/main/resources/icons/voucher/correction.svg create mode 100644 app/src/main/resources/icons/voucher/duplicate.svg create mode 100644 app/src/main/resources/icons/voucher/first.svg create mode 100644 app/src/main/resources/icons/voucher/last.svg create mode 100644 app/src/main/resources/icons/voucher/new-after-save.svg create mode 100644 app/src/main/resources/icons/voucher/new-series.svg create mode 100644 app/src/main/resources/icons/voucher/next.svg create mode 100644 app/src/main/resources/icons/voucher/prev.svg create mode 100644 app/src/main/resources/icons/voucher/print.svg create mode 100644 app/src/main/resources/icons/voucher/save.svg create mode 100644 app/src/main/resources/icons/voucher/void.svg create mode 100644 app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy create mode 100644 docs/screenshots/issue-125/voucher-toolbar-dark.png create mode 100644 docs/screenshots/issue-125/voucher-toolbar-light.png diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy index 8ed5c87d..ad4ffa9b 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy @@ -2,6 +2,7 @@ package se.alipsa.accounting.ui import groovy.transform.PackageScope +import com.formdev.flatlaf.FlatClientProperties import com.formdev.flatlaf.util.SystemFileChooser import com.formdev.flatlaf.util.UIScale @@ -26,6 +27,7 @@ import se.alipsa.datepicker.TextFieldPosition import java.awt.BorderLayout import java.awt.Color import java.awt.Desktop +import java.awt.Dimension import java.awt.FlowLayout import java.awt.Frame import java.awt.GridBagConstraints @@ -48,9 +50,7 @@ import java.util.logging.Logger import javax.swing.AbstractAction import javax.swing.BorderFactory import javax.swing.DefaultCellEditor -import javax.swing.Icon import javax.swing.JButton -import javax.swing.JCheckBox import javax.swing.JComboBox import javax.swing.JEditorPane import javax.swing.JLabel @@ -58,10 +58,12 @@ import javax.swing.JMenuItem import javax.swing.JPanel import javax.swing.JPopupMenu import javax.swing.JScrollPane +import javax.swing.JSeparator import javax.swing.JTabbedPane import javax.swing.JTable import javax.swing.JTextArea import javax.swing.JTextField +import javax.swing.JToggleButton import javax.swing.KeyStroke import javax.swing.ListSelectionModel import javax.swing.SwingConstants @@ -80,7 +82,6 @@ import javax.swing.table.DefaultTableCellRenderer final class VoucherPanel extends JPanel implements PropertyChangeListener, ListenerLifecycle { private static final Logger log = Logger.getLogger(VoucherPanel.name) - private static final Icon SAVE_ICON = new VoucherSaveIcon() private static final LocalDate DATE_PICKER_RANGE_FROM = LocalDate.of(1900, 1, 1) private static final LocalDate DATE_PICKER_RANGE_TO = LocalDate.now().plusYears(50) @@ -129,7 +130,7 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste @PackageScope final JTextArea feedbackArea = new JTextArea(2, 40) private final JTextField jumpField = new JTextField(8) - private final JCheckBox advanceAfterSaveCheckBox = new JCheckBox() + private final JToggleButton advanceAfterSaveToggle = VoucherToolbar.advanceToggle() private final JLabel voucherNumberCaptionLabel = new JLabel(I18n.instance.getString('voucherPanel.label.voucherNumber')) private final JLabel dateCaptionLabel = new JLabel(I18n.instance.getString('voucherPanel.label.date')) private final JLabel descriptionCaptionLabel = new JLabel(I18n.instance.getString('voucherPanel.label.description')) @@ -320,7 +321,7 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste seriesComboBox.addActionListener { onSeriesSelectionChanged() } constraints.gridx++ panel.add(seriesComboBox, constraints) - newSeriesButton = navigationButton('+', 'voucherPanel.button.newSeries') { createNewSeries() } + newSeriesButton = VoucherToolbar.button('new-series', 'voucherPanel.button.newSeries') { createNewSeries() } constraints.gridx++ panel.add(newSeriesButton, constraints) } @@ -344,10 +345,10 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste private JPanel buildNavigationToolbar() { JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 6, 2)) - firstButton = navigationButton('\u23EE', 'voucherPanel.button.first') { navigateFirst() } + firstButton = VoucherToolbar.button('first', 'voucherPanel.button.first') { navigateFirst() } panel.add(firstButton) - prevButton = navigationButton('\u25C0', 'voucherPanel.button.prev') { navigatePrev() } + prevButton = VoucherToolbar.button('prev', 'voucherPanel.button.prev') { navigatePrev() } panel.add(prevButton) panel.add(jumpCaptionLabel) @@ -355,27 +356,23 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste jumpField.toolTipText = I18n.instance.getString('voucherPanel.label.jump') panel.add(jumpField) - nextButton = navigationButton('\u25B6', 'voucherPanel.button.next') { navigateNext() } + nextButton = VoucherToolbar.button('next', 'voucherPanel.button.next') { navigateNext() } panel.add(nextButton) - lastButton = navigationButton('\u23ED', 'voucherPanel.button.last') { navigateLast() } + lastButton = VoucherToolbar.button('last', 'voucherPanel.button.last') { navigateLast() } panel.add(lastButton) + addToolbarSeparator(panel) addSaveControls(panel) + addToolbarSeparator(panel) - printButton = new JButton('\u2399') - printButton.toolTipText = I18n.instance.getString('voucherPanel.button.print') - printButton.addActionListener { printCurrentVoucher() } + printButton = VoucherToolbar.button('print', 'voucherPanel.button.print') { printCurrentVoucher() } panel.add(printButton) - duplicateButton = new JButton('\u29C9') - duplicateButton.toolTipText = I18n.instance.getString('voucherPanel.button.duplicate') - duplicateButton.addActionListener { duplicateVoucher() } + duplicateButton = VoucherToolbar.button('duplicate', 'voucherPanel.button.duplicate') { duplicateVoucher() } panel.add(duplicateButton) - correctionButton = new JButton('\u270E') - correctionButton.toolTipText = I18n.instance.getString('voucherPanel.button.createCorrection') - correctionButton.addActionListener { + correctionButton = VoucherToolbar.button('correction', 'voucherPanel.button.createCorrection') { if (currentVoucher != null && !confirmRecorrectionIfNeeded(currentVoucher.id)) { return } @@ -385,31 +382,32 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste } panel.add(correctionButton) - voidButton = new JButton('\u2716') - voidButton.toolTipText = I18n.instance.getString('voucherPanel.button.void') - voidButton.addActionListener { deleteOrCancelVoucher() } - panel.add(voidButton) - - panel + voidButton = VoucherToolbar.button('void', 'voucherPanel.button.void') { deleteOrCancelVoucher() } + voidButton.putClientProperty(FlatClientProperties.STYLE, + 'minimumWidth: 34; minimumHeight: 34; foreground: $Actions.Red') + JPanel toolbar = new JPanel(new BorderLayout(18, 0)) + toolbar.add(panel, BorderLayout.CENTER) + JPanel deleteGroup = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 2)) + deleteGroup.add(voidButton) + toolbar.add(deleteGroup, BorderLayout.EAST) + toolbar } private void addSaveControls(JPanel panel) { - saveButton = new JButton(SAVE_ICON) - saveButton.margin = new Insets(5, 6, 5, 6) - saveButton.toolTipText = I18n.instance.getString('voucherPanel.button.save') - saveButton.addActionListener { voucherEditorActions.save() } + saveButton = VoucherToolbar.button('save', 'voucherPanel.button.save') { voucherEditorActions.save() } + saveButton.text = I18n.instance.getString('voucherPanel.button.save') + saveButton.margin = new Insets(0, 10, 0, 10) + saveButton.putClientProperty(FlatClientProperties.STYLE, + 'minimumHeight: 34; background: $List.selectionBackground; foreground: $List.selectionForeground; focusedBackground: $List.selectionBackground') + resizeSaveButton() panel.add(saveButton) - - advanceAfterSaveCheckBox.text = I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') - advanceAfterSaveCheckBox.selected = true - panel.add(advanceAfterSaveCheckBox) + panel.add(advanceAfterSaveToggle) } - private static JButton navigationButton(String symbol, String tooltipKey, Closure action) { - JButton button = new JButton(symbol) - button.toolTipText = I18n.instance.getString(tooltipKey) - button.addActionListener { action.call() } - button + private static void addToolbarSeparator(JPanel panel) { + JSeparator separator = new JSeparator(SwingConstants.VERTICAL) + separator.preferredSize = UIScale.scale(new Dimension(1, 22)) + panel.add(separator) } private JTabbedPane buildMainTabs() { @@ -763,7 +761,7 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste String attachmentPathToApply = pendingAttachmentPath pendingAttachmentPath = null pendingAttachmentPreview = null - reloadVoucherList(advanceAfterSaveCheckBox.selected ? null : savedVoucher) + reloadVoucherList(advanceAfterSaveToggle.selected ? null : savedVoucher) if (attachmentPathToApply) { try { attachmentService.addAttachment(savedVoucher.id, Path.of(attachmentPathToApply)) @@ -1503,17 +1501,20 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste private void updateLabels() { datePicker.locale = I18n.instance.locale refreshCaptionLabels() - prevButton.toolTipText = I18n.instance.getString('voucherPanel.button.prev') - nextButton.toolTipText = I18n.instance.getString('voucherPanel.button.next') - firstButton.toolTipText = I18n.instance.getString('voucherPanel.button.first') - lastButton.toolTipText = I18n.instance.getString('voucherPanel.button.last') - saveButton.toolTipText = I18n.instance.getString('voucherPanel.button.save') - advanceAfterSaveCheckBox.text = I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') - printButton.toolTipText = I18n.instance.getString('voucherPanel.button.print') - duplicateButton.toolTipText = I18n.instance.getString('voucherPanel.button.duplicate') - correctionButton.toolTipText = I18n.instance.getString('voucherPanel.button.createCorrection') - voidButton.toolTipText = I18n.instance.getString('voucherPanel.button.void') - newSeriesButton.toolTipText = I18n.instance.getString('voucherPanel.button.newSeries') + VoucherToolbar.updateLabel(prevButton, 'voucherPanel.button.prev') + VoucherToolbar.updateLabel(nextButton, 'voucherPanel.button.next') + VoucherToolbar.updateLabel(firstButton, 'voucherPanel.button.first') + VoucherToolbar.updateLabel(lastButton, 'voucherPanel.button.last') + VoucherToolbar.updateLabel(saveButton, 'voucherPanel.button.save') + saveButton.text = I18n.instance.getString('voucherPanel.button.save') + resizeSaveButton() + VoucherToolbar.updateLabel(advanceAfterSaveToggle, 'voucherPanel.checkbox.advanceAfterSave') + VoucherToolbar.updateLabel(datePicker.calendarButton, 'voucherPanel.label.date') + VoucherToolbar.updateLabel(printButton, 'voucherPanel.button.print') + VoucherToolbar.updateLabel(duplicateButton, 'voucherPanel.button.duplicate') + VoucherToolbar.updateLabel(correctionButton, 'voucherPanel.button.createCorrection') + VoucherToolbar.updateLabel(voidButton, 'voucherPanel.button.void') + VoucherToolbar.updateLabel(newSeriesButton, 'voucherPanel.button.newSeries') addAttachmentButton.text = I18n.instance.getString('voucherPanel.button.addAttachment') openAttachmentButton.text = I18n.instance.getString('voucherPanel.button.openAttachment') jumpField.toolTipText = I18n.instance.getString('voucherPanel.label.jump') @@ -1542,12 +1543,18 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste } } + private void resizeSaveButton() { + saveButton.preferredSize = null + saveButton.preferredSize = new Dimension(saveButton.preferredSize.width as int, UIScale.scale(34)) + } + private static DatePicker createDatePicker() { // DatePicker's null bounds default to a fixed ±20-year range calculated at construction. // Use explicit bounds so historical vouchers and AI drafts are not silently rejected. DatePicker picker = new DatePicker( DATE_PICKER_RANGE_FROM, DATE_PICKER_RANGE_TO, null, I18n.instance.locale) - picker.textFieldPosition = TextFieldPosition.RIGHT + picker.textFieldPosition = TextFieldPosition.LEFT + VoucherToolbar.configure(picker.calendarButton, 'calendar', 'voucherPanel.label.date') picker } diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherSaveIcon.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherSaveIcon.groovy deleted file mode 100644 index 88328af0..00000000 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherSaveIcon.groovy +++ /dev/null @@ -1,34 +0,0 @@ -package se.alipsa.accounting.ui - -import java.awt.Color -import java.awt.Component -import java.awt.Graphics -import java.awt.Graphics2D -import java.awt.RenderingHints - -import javax.swing.Icon - -/** - * Cross-platform save icon that does not depend on an emoji font. - */ -final class VoucherSaveIcon implements Icon { - - final int iconWidth = 16 - final int iconHeight = 16 - - @Override - void paintIcon(Component component, Graphics graphics, int x, int y) { - Graphics2D g2 = graphics.create() as Graphics2D - try { - g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON) - Color color = component.foreground ?: Color.DARK_GRAY - g2.setColor(color) - g2.drawRoundRect(x + 2, y + 1, 12, 14, 2, 2) - g2.fillRect(x + 5, y + 2, 6, 4) - g2.drawRect(x + 5, y + 9, 6, 4) - g2.drawLine(x + 7, y + 2, x + 7, y + 5) - } finally { - g2.dispose() - } - } -} diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy new file mode 100644 index 00000000..b2c2c712 --- /dev/null +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy @@ -0,0 +1,61 @@ +package se.alipsa.accounting.ui + +import com.formdev.flatlaf.FlatClientProperties +import com.formdev.flatlaf.extras.FlatSVGIcon +import com.formdev.flatlaf.util.UIScale + +import se.alipsa.accounting.support.I18n + +import java.awt.Color +import java.awt.Component +import java.awt.Dimension +import java.awt.Insets +import java.util.function.BiFunction + +import javax.swing.AbstractButton +import javax.swing.JButton +import javax.swing.JToggleButton +import javax.swing.UIManager + +/** Shared sizing, accessible names and theme-aware SVG icons for voucher commands. */ +final class VoucherToolbar { + + private VoucherToolbar() { } + + static JButton button(String iconName, String labelKey, Closure action) { + JButton button = new JButton() + configure(button, iconName, labelKey) + button.addActionListener { action.call() } + button + } + + static JToggleButton advanceToggle() { + JToggleButton button = new JToggleButton() + configure(button, 'new-after-save', 'voucherPanel.checkbox.advanceAfterSave') + button.putClientProperty(FlatClientProperties.STYLE, + 'minimumWidth: 34; minimumHeight: 34; selectedBackground: $List.selectionBackground; selectedForeground: $List.selectionForeground') + button.selected = true + button + } + + static void configure(AbstractButton button, String iconName, String labelKey) { + FlatSVGIcon icon = new FlatSVGIcon("icons/voucher/${iconName}.svg", 16, 16) + icon.setColorFilter(new FlatSVGIcon.ColorFilter({ Component component, Color ignored -> + if (component instanceof JToggleButton && component.selected) { + return UIManager.getColor('List.selectionForeground') + } + component?.foreground ?: UIManager.getColor('Label.foreground') + } as BiFunction)) + button.icon = icon + button.margin = new Insets(0, 0, 0, 0) + button.preferredSize = UIScale.scale(new Dimension(34, 34)) + button.putClientProperty(FlatClientProperties.STYLE, 'minimumWidth: 34; minimumHeight: 34') + updateLabel(button, labelKey) + } + + static void updateLabel(AbstractButton button, String labelKey) { + String label = I18n.instance.getString(labelKey) + button.toolTipText = label + button.accessibleContext.accessibleName = label + } +} diff --git a/app/src/main/resources/i18n/messages.properties b/app/src/main/resources/i18n/messages.properties index 08f201de..36c8191b 100644 --- a/app/src/main/resources/i18n/messages.properties +++ b/app/src/main/resources/i18n/messages.properties @@ -847,8 +847,8 @@ voucherPanel.label.corrects=Corrects voucherPanel.label.correctedBy=Corrected by {0} voucherPanel.label.series=Series voucherPanel.button.newSeries=Create new series... -voucherPanel.button.prev=\u25C0 -voucherPanel.button.next=\u25B6 +voucherPanel.button.prev=Previous voucher +voucherPanel.button.next=Next voucher voucherPanel.button.first=First voucher voucherPanel.button.last=Last voucher voucherPanel.button.save=Save diff --git a/app/src/main/resources/i18n/messages_sv.properties b/app/src/main/resources/i18n/messages_sv.properties index 72799c83..bf8ffde9 100644 --- a/app/src/main/resources/i18n/messages_sv.properties +++ b/app/src/main/resources/i18n/messages_sv.properties @@ -847,8 +847,8 @@ voucherPanel.label.corrects=Korrigerar voucherPanel.label.correctedBy=Korrigerad av {0} voucherPanel.label.series=Serie voucherPanel.button.newSeries=Skapa ny serie... -voucherPanel.button.prev=◀ -voucherPanel.button.next=▶ +voucherPanel.button.prev=Föregående verifikat +voucherPanel.button.next=Nästa verifikat voucherPanel.button.first=Första verifikatet voucherPanel.button.last=Sista verifikatet voucherPanel.button.save=Spara diff --git a/app/src/main/resources/icons/voucher/LICENSE-lucide.txt b/app/src/main/resources/icons/voucher/LICENSE-lucide.txt new file mode 100644 index 00000000..325e8ff0 --- /dev/null +++ b/app/src/main/resources/icons/voucher/LICENSE-lucide.txt @@ -0,0 +1,15 @@ +ISC License + +Copyright (c) for portions of Lucide are held by Cole Bemis 2013-2022 as part of Feather (MIT). All other copyright (c) for Lucide are held by Lucide Contributors 2022. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/app/src/main/resources/icons/voucher/calendar.svg b/app/src/main/resources/icons/voucher/calendar.svg new file mode 100644 index 00000000..eb1e4d8e --- /dev/null +++ b/app/src/main/resources/icons/voucher/calendar.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/app/src/main/resources/icons/voucher/correction.svg b/app/src/main/resources/icons/voucher/correction.svg new file mode 100644 index 00000000..b571a770 --- /dev/null +++ b/app/src/main/resources/icons/voucher/correction.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/resources/icons/voucher/duplicate.svg b/app/src/main/resources/icons/voucher/duplicate.svg new file mode 100644 index 00000000..49bfe72a --- /dev/null +++ b/app/src/main/resources/icons/voucher/duplicate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/resources/icons/voucher/first.svg b/app/src/main/resources/icons/voucher/first.svg new file mode 100644 index 00000000..6602bfe2 --- /dev/null +++ b/app/src/main/resources/icons/voucher/first.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/resources/icons/voucher/last.svg b/app/src/main/resources/icons/voucher/last.svg new file mode 100644 index 00000000..dc230247 --- /dev/null +++ b/app/src/main/resources/icons/voucher/last.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/resources/icons/voucher/new-after-save.svg b/app/src/main/resources/icons/voucher/new-after-save.svg new file mode 100644 index 00000000..51de5441 --- /dev/null +++ b/app/src/main/resources/icons/voucher/new-after-save.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/resources/icons/voucher/new-series.svg b/app/src/main/resources/icons/voucher/new-series.svg new file mode 100644 index 00000000..63f14777 --- /dev/null +++ b/app/src/main/resources/icons/voucher/new-series.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/resources/icons/voucher/next.svg b/app/src/main/resources/icons/voucher/next.svg new file mode 100644 index 00000000..81c3d14e --- /dev/null +++ b/app/src/main/resources/icons/voucher/next.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/icons/voucher/prev.svg b/app/src/main/resources/icons/voucher/prev.svg new file mode 100644 index 00000000..e21b6186 --- /dev/null +++ b/app/src/main/resources/icons/voucher/prev.svg @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/resources/icons/voucher/print.svg b/app/src/main/resources/icons/voucher/print.svg new file mode 100644 index 00000000..b89cf650 --- /dev/null +++ b/app/src/main/resources/icons/voucher/print.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/resources/icons/voucher/save.svg b/app/src/main/resources/icons/voucher/save.svg new file mode 100644 index 00000000..eadf8354 --- /dev/null +++ b/app/src/main/resources/icons/voucher/save.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/src/main/resources/icons/voucher/void.svg b/app/src/main/resources/icons/voucher/void.svg new file mode 100644 index 00000000..02b83ecb --- /dev/null +++ b/app/src/main/resources/icons/voucher/void.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy index c4f26ae8..0c120e08 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy @@ -23,13 +23,13 @@ import java.time.LocalDate import java.util.concurrent.TimeUnit import javax.swing.JButton -import javax.swing.JCheckBox import javax.swing.JComboBox import javax.swing.JLabel import javax.swing.JTabbedPane import javax.swing.JTable import javax.swing.JTextArea import javax.swing.JTextField +import javax.swing.JToggleButton final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { @@ -49,8 +49,7 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { } assertNotNull(saveButton.icon) - assertEquals(6, saveButton.margin.left) - assertEquals(6, saveButton.margin.right) + assertEquals(I18n.instance.getString('voucherPanel.button.save'), saveButton.text) } @Test @@ -213,8 +212,8 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { assertEquals('Försäljning', onEdt { panel.lineTableModel.rows[1].accountName }) assertEquals('Rad två', onEdt { panel.lineTableModel.rows[1].description }) - JCheckBox advanceAfterSave = findComponent(panel, JCheckBox) { JCheckBox checkBox -> - checkBox.text == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') + JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton checkBox -> + checkBox.toolTipText == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') } assertTrue(onEdt { advanceAfterSave.selected }) onEdt { @@ -285,8 +284,8 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { void savingWithDefaultAdvanceAfterSaveShowsANewBlankDraft() { JTextField description = findComponent(panel, JTextField) { JTextField field -> field.columns == 30 } JTextField voucherJumpField = findComponent(panel, JTextField) { JTextField field -> field.columns == 8 } - JCheckBox advanceAfterSave = findComponent(panel, JCheckBox) { JCheckBox checkBox -> - checkBox.text == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') + JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton checkBox -> + checkBox.toolTipText == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') } JLabel unsaved = findComponent(panel, JLabel) { JLabel label -> label.text == I18n.instance.getString('voucherPanel.label.unsaved') diff --git a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy new file mode 100644 index 00000000..0b4b86de --- /dev/null +++ b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy @@ -0,0 +1,64 @@ +package se.alipsa.accounting.ui + +import static org.junit.jupiter.api.Assertions.* + +import com.formdev.flatlaf.FlatDarkLaf +import com.formdev.flatlaf.FlatLightLaf +import com.formdev.flatlaf.extras.FlatSVGIcon +import com.formdev.flatlaf.util.UIScale +import org.junit.jupiter.api.Test + +import java.awt.Color +import java.awt.image.BufferedImage + +import javax.swing.JButton +import javax.swing.LookAndFeel +import javax.swing.SwingUtilities +import javax.swing.UIManager + +final class VoucherToolbarTest { + + @Test + void svgCommandsHaveConsistentSizesAndFollowForegroundInBothThemes() { + SwingUtilities.invokeAndWait { + LookAndFeel original = UIManager.lookAndFeel + try { + [new FlatLightLaf(), new FlatDarkLaf()].each { LookAndFeel theme -> + UIManager.setLookAndFeel(theme) + ['first', 'prev', 'next', 'last', 'save', 'new-after-save', 'print', + 'duplicate', 'correction', 'void', 'calendar', 'new-series'].each { String name -> + JButton button = VoucherToolbar.button(name, 'voucherPanel.button.save') { null } + FlatSVGIcon icon = button.icon as FlatSVGIcon + assertTrue(icon.hasFound(), "Missing voucher icon ${name}".toString()) + assertEquals(UIScale.scale(34), button.preferredSize.height as int) + assertEquals(UIScale.scale(34), button.preferredSize.width as int) + assertEquals(button.toolTipText, button.accessibleContext.accessibleName) + button.foreground = Color.MAGENTA + BufferedImage image = new BufferedImage(icon.iconWidth, icon.iconHeight, BufferedImage.TYPE_INT_ARGB) + def graphics = image.createGraphics() + try { + icon.paintIcon(button, graphics, 0, 0) + } finally { + graphics.dispose() + } + assertTrue(hasForeground(image), "Voucher icon ${name} must use the component foreground".toString()) + } + } + } finally { + UIManager.setLookAndFeel(original) + } + } + } + + private static boolean hasForeground(BufferedImage image) { + for (int y = 0; y < image.height; y++) { + for (int x = 0; x < image.width; x++) { + Color pixel = new Color(image.getRGB(x, y), true) + if (pixel.alpha > 0 && pixel.red == 255 && pixel.green == 0 && pixel.blue == 255) { + return true + } + } + } + false + } +} diff --git a/docs/screenshots/issue-125/voucher-toolbar-dark.png b/docs/screenshots/issue-125/voucher-toolbar-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d0b9b69d7ce9412368e98a0aabd4e1293709aeaa GIT binary patch literal 11985 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 ecnCz?pyRq%5h-bq66x+zx}-bh(A{x}!@I%z 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%0Dfxzr0XNLHdTP**z& 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 Date: Fri, 13 Nov 2026 15:40:57 +0100 Subject: [PATCH 2/5] =?UTF-8?q?L=C3=A4gg=20till=20verifierade=20Windows-bi?= =?UTF-8?q?lder=20av=20verktygsf=C3=A4ltet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue-125/voucher-toolbar-windows-dark.png | Bin 0 -> 6379 bytes .../issue-125/voucher-toolbar-windows-light.png | Bin 0 -> 6680 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/screenshots/issue-125/voucher-toolbar-windows-dark.png create mode 100644 docs/screenshots/issue-125/voucher-toolbar-windows-light.png diff --git a/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png b/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..55f3ebe2122b2ae3cc5065820bbc43b841652685 GIT binary patch literal 6379 zcmb_hc_7qn*B(oZMi~?;*;~Y9&u%Qq7JA4wma%6GS+ZowR@o9FyU3DtBzu;c3Nf;i zoos{bBgPE#{U%TE^S0jb*08tJcjU4*-^#0W#hjGu(mlyUdmJ&?I zY0{S+Df?lDz%~QMGC!Z_O96+!ACU4V&ZWk74OZ_Y4OWkSakX3QQ{FuWfD?3m)_R?b zx}ep*rn=$&?d;-Z9@!Tx4MG5*JNLrGFH&*~OH{6&4@@Y2QPmR&0F;S7mnXsq4k`M8 zKM4YHz5mm}bO0>~1f8aFyh*KmyQ12Y1GYUC{MBctZ~Ynw^t9ROW(Uzcy0F_7YxGTE z>*Nn)qiKuuNlA4Z9%wEl9#Zey&4hTX%H_h;CI)(c$}ITO%D_nMj?E=p^pDeiv^tp+ z18z@0{&MyD;W=zFBlz6sO?r^9_Z6u9*dk8g2e%(5F5Qy=`%dF12mpA0!mINJBwTGM z&b)5#Au_&DZ-BRYL}BWfR2BuOK==lQNgnc-zML zjOSUy3gf@uetim@9k?d_rgC@P0_pc%BREOUo5YkH$DiQQ+&R^4Ri=j6pX^g>RegE~ zq?oN*`B;BRCPk`Lo#-@g@u<9Q9)(2pF+Hx2UkWRU3b?#^j;{=NUtOzSDa}Iuc(|)# zK#aZwv~_qWzbYDDy(d2F%*#`lH#0dEynAvH;%dTh?k;na=F}M&^v3h28q!lI z6631QO7vd#kfQ?a3ns|Zlp$$njY=3@-Ei`H<~MvrXkRd_l~x@oYbB?^ z$b*sYM|2G2yya)CKl-AEh)u)lc>xIguL20V%o2Ebj7oC6YxRr!roDI@*)#%&QOGF; zR-Ic{^cX~~=2Rl5xE!g`@9RP~+;&qwJ4fGWh_Ey@|MD1bQ)OApm`_Dx7t#}WAdH&R z^|lmyymWqFcPEI4z<~7;MQ%(D5*=^#$__;7XnYLqnHQq{Cv>EP2UCP4-QZ=?u#z@S zyKvLptMdV@?6AZBnMq#b656@bwbP^}_>KVnBWID1gR4az)|Uo^Gvj+8wa=vQC32i* zr8BXd`sfCU%5gqIylm4X$CHqsP{F)sKX!k-?cPtlWt7qWn5jhxF+!LU*OfoO^mm*2 zSd2ZG)3q~L>Q2!hr_|;cx;M&C6(zxnt4W)zP+xlZ;qk0Vuks&%pd?mgcJQiAFC}|J zi-pUvBx{$F0X4hJ0+VcJ0e! zdqf1YdZKdEbOLpH7x17a&2{Z)jJU4=#vtg8dN04DL#BS{e0y=O-L_+|rM%v7n8<`A zf~(PY>4OpSV49$u?Yos7A=tRJT*Auf+s>)aHyI|IvYaj7IsC^g69e*)8fOaHQgpTI*?sMHdvnF>*bZ)e zmsCeAtv*Zk2orCTVFmMkjQVjtnbRLDa%gEzk7Z-gb%=jm(3U5N?dqxyv2?=sw}(z% zxjO&+c_q7vL6wUkPuO;0{4cyQm(M49G((=I0`$^7Gi`*i@;A$FbfOf*rCl`nrVt#cyHtD&}-I(lE6H$RWrFkD@*PFEDCv zPro^BVqv-U+9%ZYR<9|C5O=Y$`$)F&K-}nBwJz$%!D!@z+GS!jbAIQ7ul)P*#>m{F z-zldrg~T?GV?`DKm?9`cm6h^VL8n9E+EU2@8;n(agGo$3++=_i{||AyLX8gbZanD* z_Yz^_jG;Horx#15!dNdAoAE&xbZ2dNPB)c&68WGG3tqvodrt%x53`8qYUng4zI3=6 zSEHezz&2}ydzkzEHr9m;!>L+AEZn3xEVhhk8JaS!Fc7YEFo|aG20c`WwqXa)HV=#Ug114V1ur$I{MrAXAn#e+?dBe9XhWh0Ix9pQWk%ZTbX# zpV6IY@D?By%5HN51}3i!M{G|#0|Z9OYxSQFoJImi8FcE6IG48oJ(_a{$HO1oDe=tq z`?0=*;`FjjqVF*c^kqndPmvW!;^{9OtFun?*A<@koy*(wo}np{CQnrUB0B@BnLT?# z0P8f+U{ZKSUImW)ls-8AKz)+-U|~Ecx=!gVBm{ceooYgq((2WplNPOiM{+1Gvqz}X zXzsj}_kI1p#=bN>*Y1$ejW4&@pP&J~?=_0mNNsW6#EqN)jH*tC97Ox9NVd)Vk`$Is z?#)yn5ZL`sNg_1`ND*qlBXbBeOT%5gEUn^(~s@}f}^Fjg= z>nk7&09|6~#4aDSg=t+_9&J!Ch}FF>@b9F~&#o>MC;Uz7UAr;a>cokTulW&c5J1bB z92p1P{D0~;z}kN*`-&K;X3l$VKOP>Eytdv|iwzhIRaOjdk5$|0+K)$7DOw?CAWdk#C zn!tm$aN~!vJH?wvauAhv8+kKc<2+yDvU7r^=RPrMK3W$hzk$+Mv#4qGO;zsPj>1Wt z{~f{oj%CCuVBOO(hoG~po_-q$w7s6s)lyy>^xO22akP1Z1?xzCRnLyb&fg%%WhHk_(Up!N!Z`OoiwP9JYs}YXgamoR7?fG7`fzX>{A;JU7 z5b@#&-5wV!mX)MQ9%lt9iLMM6$hIgU4Pfa6!hr&$s8;1ZsO6%>MPJ=R8S6B|EN+_e z*+0LwJ&i#}TkOb5L5!ktEeir*0wc_9hshKQR)JML`8FyYr-^&;4SmUh>{-(-UV<|t z&0eP_!Y?&Y`%FlME367o^t_0=?sG%~KV8Xw& zsl-(pu4v5n=iNFQIf&n5gNdWT^Ub)}?BJbxNlDbftvGQ2l8G{xnK_`1I@ZW4^WiD| zAiD^>HO6}F6@k@o7^qXJGtY8M`)0N6A#d5Fd>t-eAJ`sXiJ3)kec5~}p3Y&4G|#}le(Oczq2o(#XPd;qDU6IU@%q^% zBuCu%IDDL=Qj-Q-CJyAE*z>S#wPJp9HeQWG+I{002P&xs1hTZ}v)JJ~T+NX6>3z`N z|LJDRw@^hkryN!4kP0SBtN2nuDLRd?;Gp%u$k2or7Jjp}L0kcZp?6Dk#oP&zzy245> z-Tc>TPLZ&*6XEA}?eQf(b6JW}{(1HQhw`6t!0UlMY*_nM^=n8-MS=)b4*O{j7py-& zaP@(?J%+WI`So_GVE&sXChkmdVmB#h^UivE=-dSj?Ze_hU81RfsM8bakv_kr`Z~oF z1>UzP{uK)@xyqoMlsV)rlJ~J%#t7yF(&Vh3^@=Vid77pV}}$&}S_3cx`X>paq>g zh@@3ntm_?gBrW<5k~oMwOjvx!z<~@t?8`gKWO)mzJF|i+`i6} zjL$BTnA2dG+;zk~u0|VIQtDd|dD-BNo+yiSfnWK#+_ZciVUjdZxbhU(4;$75?#@)5 z0+$qgP*Q@tHO^~&aG7ON*6PHxneG#)jwO( zdPnD)odx6Cn40&*ou3kRpF@PlM(e#-hN6Xy52)Og*BsK`blg_A4L z;OPija6gJNM|K)zR=?lV25)}%?p=j%EywKhUsd?rVuz?$=Q};!j6YCjF|+HSoXL!) zEj|M1P`vw&g0|P;MX-7K>nzmqEGKHTrW0LwSXwjcn;^>aBo~YHvj%3pi z=K|`AH5q1h5YaAYMGHoQRzn5eI6RwtXiay9>!WRj#e9lTtDwx`n^W-eD0I3FP(lix z*(6dor`BVj5KUX#8*w!{j=%`Fzp-S{%@9teI}p!j$Bek4$<9}yG&x^&ePotSmksis zr?k32jpi{?c8?0^d<|^i@K)PL0!H+P$5cH(K9nBO-0nj_!iN>MQ-~5~8o=rzdXr{F zUTPs)BwB}-%Ifg5yAKAw)z0e)iD*f#r~=xh*ehJ|BCRqj$xGF3o}4O1Fzwqt*ee(< znrjw6(<6_m7DFW~N}=yr1HcQ)13O=l#x!v9 zy?sZ(eo*P$oYj0RnN8*jPGS9>J1G!|d%f>;Up{RpXSws0-&|hWD-`e-KsrJSn-rx| z4w14VRZN*C;sUCj3S!VSif&-VNE5N4LHoA={BSxCED5~S%5cNe$CPVJ)h>!&GIg{- zIEM(6azs&0KS#BMCVHsyE|)j~|A#dpCEf(=wF5N#3(L3y(10^!Ng}%?NPxZ`JIe+| zaN-x;WPqN^zc~^Yyx1N5V=YXJOkXF;nI8w%`%OY$12-x;tSgv!0r?XQ+z#Qh+Iez;D}sCR8)WD;g6}nH%2R&@4G`nX%FP6b7GK zkY3Mv$ejtu$Tn5ZHHi>+cAzI3qgW8vQ$nDst@Po%z&!b-KbS)MU$pE*!&`O_<1Csl zoLNee3?cv=koLQx`fFd9tU0z|tG{r16Bt~ijkaB{UzOaei2c-JcYBzM%uEEK<^K2O z!IHwS8H3)7b4y}IPKE-!e0?(mkQKQLhwz!| zP&H;CP-CMf#{%}asc?pzqber9y+5r#kX`(0F6i5S<;=_4t)v=vaCi<72`E^A8&F6c zq58Y2WH)WV3kQ+&#aUmV{o^iD0IgID9G>5DpXY0UhTU<*IVWq$@S!81euOW_c~oY=>_P21AvWa?q*25kGOV4?zzOM?hda;P50UINH|k zLlFVvU zjxNPd4~TnK!Z4jboIAkb-p>C^6)a-SCHF413pSp=@=KGOXaBVojDD-H2-xJ$yk8JO z-UkTVSC*YeF*SNY-k;iS$q&kz1M%02fOlt1-kO=Q8h!ZVxKd8IpT8?9)Bo2d0_+M# z+QmWz?Rh5?G zi{GYbMDpV4CFfB|$(A7EC;OUw9|^MIfb5+}-G5wNe!bYguj2hbKgs`BtKIJ(1O`YH Y)4_b^;&gg^0oU1^U4@4>T|d!JA1EeyKkQwhZ?XA8W-!J&GF4fmEb zsSJlwpSLm;NM?c0zBcE+Y-sMPD_?aL3f4STQ23Kp>Un%e%`mTQdwcsN|7dyCa6S0e z(=-cwaKU7U_nytvDsf^yU@qP3Yw~7>l;~8f(zi7G$z=OL^gJ5>u#7;j1ZV?#Zppqt zSwUG`{Itg?>%0HIHTYviLqh`!CCz!7_1)dmf;31LX+aR^Zj=Ztg^}v=O-Umoqc?Bf zJOf_;?c=bP=~A=WEgD1j*&nav?WsVZM9XL8dcz=LGPHEn-M1e6^EjlBCD zJvur*j`mpWFVugx1^FFjzK82X)_(Y~RXSSRanb?G5?XM%WsgC2doh0cz-w<)>x--0 zG0{*S<249 zR+`pv?~7{`E1f#f(H>OF_5=PwL>aaQ(irp@#^})u@%jC$#RJ0xhH(#e_v0 zY0YNa)G5aOx_B2B&JIOS{U|nMw5)%&5=?W6*!xmejQ?_KZm`&ZpD&8!^R5-o2g<57 z6=#Q`^80iaw*rIbluMFMDPm0!zJpbk-H5yQ@^rvXC;ZI@9ukXA z$a?&mx?cmoxcGZMoe7f(dOqnm^r+(zPT`W;gxQw1pNE*h>xL7r!SczPMoLR5`?QgJ zl8hG_a;v3w2|<^mB8fNb-)?XokTZk(S6jS!@U=WO;N2UBuD>h>dF2W$l@RXPMlj;& zoqE3@{C3BcSYqmI-d<|?Tg~Kzp8A=<)9fn_i^}RQY^;Z87jZH;#e_t3V_TI4z1XEq z^KJz-G`${q>@^;*%HqSnZpKoScKQY2NbbUr(}+OMBaN03(o0VnW}MSdR95~@`T|u% zVSdU z`UK9HjXtP``|eQPM_-6?aaOZE@97XH81pz%&<~RsP#MYvR?ICiu|eKs8WqXY+#3?0 z#bd|^u;UK-gsoivNru;crXl%p*8+jWY&gfo@J{5aqJmO!u=w{vgW{(s5iO;n#!eW`3uXd-e%vIFpwenVT3)W}cg!Lx+Q@VawkZE_wLgeXMP49pE@ zh3OxnD{$)~SQvq?{v7J&v$0PA_I~hpx?^UsV(rTiLO&Rbq|xV)HxwI zlTkI3@(0w)d+X&(n<3MYrjmu~bY+8Rb-Qwn(LHBIe?;i=k}cMksHfPq-IQ_j{kM7f zQbaj%`F(nNy8Has6<>^kx+Mx@SG+G+0puV|RXeIA>4wGC$L8lf1R=0082@23486qY zKVNje8CjwLM5O7yc+yWi)1}YpK^F`J8;Rd&F~_eLQ+wr{x#kwd32v@ivb^tV@eN-$ z=WBa2n%E7ts)812dW*R`Dclch6RfV(6DrvqfBRuq(AIen1#!z;GD=F_e~?^B`2J~E zLzkj4YNxW~=?FBsSYm|&4}h1Ja=1tZCH_A-ro0!jU)tava_xiOIQ7KzQ;HxQ0e>T9B0ax(?q*&_zkTUQ|6 zU;!qHaCgri6%RjSi<%}D?m_AmZ3W)l%LdS*U;)wCWEtccw0pM3l8ycfP=~)fJ5PAf zY5Ny5zp+{e3+WZTaMm*d+o7OK{gKGHb2XNQKoXV9it`*=z!o7UY^gL>4d9`bf^BL- zkIayLBvQaKTx{)%T~$8fA38471@m$~>1yJCJeSaxUfJi!*ek?T*U%h5QmMEkA;@_v z_6|xhu>->(4Zzv6D6E0jOL+hb8JB~w+zab-C=3%d-Fg6>m4XOI5{$31FiWj0$B=Bp z3K?paSfZUf))MaM0Cg$ETzX%yt!9g_J(E$r9Xx}fmyD^1BKIqHg%IOZQh#%lagUFT zcoU~z+TuFmuJqg?jIT}(Yn7Ch?Kxv9)v2}{i&+(%u{z;Sa5$;CPC@5V;-d?v#im`E zKj^~XCgUQ?K(Q8!gj~iXo1O8Z|6Y*Q6P?;rw& zW=|QXCx}A`NC66lX)!{!szjmM8|WX z*3Ql=pXClJ4mO$sDplDR0!}-&%wMFs40`b4A15BQQtp9Px(Q12g-;+{-6jsu`p|K0 z(5Kr#`|{r1T9olxUC{r<_VI)p7r+OQR(D+tk&ig3E<1Lt1%|{TT#Nqs>&5=On3x#Z z;ZO<_5QaCFxO6wtpYSb4Dg5N8)otOa)cn&Ak>Bo6;cfavgR{KcyPqwQjl#RFW99|zMp*>ZdQBu%iEod=1 zpCi?*2km|E0?9fbm-ZnIZH{Oxg20WhmZ@I)ytK6BdTWrz5dj$SM0VX|yV?Xt1SvHSsc4zCa7Jn0``|UEaI<=H~Rp={u&gOk0Mw zAB9EBR85!I-#g5G$@L1UNQQJhsDkDK9RC_L+BX8iPg_F|xoOCjk(Jy`FClnGF|65P zEXst=whj=CK$Jga14fr#CN`ypRu+~}(=e8#B6{uK!$UK8?oErWw3WPonj@2k6<{NE z^bml3N6_b3T7$vzLiZxW6$f+i58m)S%D)-Xt)^XZi$vLc$5oUfP^|(Rss1k#^!i=G zRw#4c!>#@6*xq+`IbqkHh->pUa76zx7D(MVt3h=Q7_7in(T7E;) z8OavUWFJko$>N3NPXy{TQdENfoj&x>3s9y`NqBFGScj}wa)_P4S8i`3?8(s zG170|h0ag#T3-2H8++-_uEAYIrE2ZzBtB+5wV9b&S;OzKw&y2pc^0Ct!P1^2EJ=|~P0ZlQ zb48Jz_!@m?YhU(Q_>s;8?T_XySL$8YCU10ONW)fj>R;RZ>k@~zL*hA5$X}!T1A9S) zba$&gSCP#Wy~)zp+Z!EOp^y7ZPt1K$KsC+H%?)VFk?x-wO(3q++JQwEWCHi=v_8)F zX5TX|vm7cFN(ADy5Z$V)jl~SS)8^Xj=xj~7DMCe+{pPZw0+xmO1!@47pG3)+etm=U zT9qo|#Df(%%vx$KPV2OB?LNX4S1OlhtfOz*_0r780>3hT@Vn1YZlj01US$45P%t&Z z*k(>V4{at_udLkpGtvhd_hfB%xlH}ovz0ON1}m}GKYqr_9kg?}EHIoGeZjURbp3jo zl)Dm@%Xr;W;@UJ{roUT2fQ2*IFds-*Q6}Yvm>34g@iI7O)e;+tPWaJe^r4kyK#0~> zA}600%6IeKt;@hRC9{E#Rh8AFk#8Xs7k4!#9GuKER+;MUI|+E6>nlijfU?o7mfFy)%WmgOt^7ly{PcV*rfcdDH%XC)Y2aisZG7IiD?Y*_ zBroq8gx1qzYN*(lImmGkh+x2LQ?0wogoB9gb`^&KhB+3|gOdUMg1Ig#XZkpbD8W(L#h~f-yK6!oalHb959tw zKLion$Icu^ENi!agq%sK`2brgD-@Om1oBYwAB_L_R*=fVgb2G_*OQ2Ne?6@V(Q6p; z@(fqTQjoQ-x%hpjb}rTF;ot~yE9)wG|40)PMilkBgoU0LijzI(Wwe@JQqx~sK?G)x zHV*GOs%h;o490!_Qw)iKESsz);6saDFoYcANqWM>_R?KoJUh(&nrEbjAn#uY@WGGS zc0U=fpb+&sBqqs6bKPq>f|;+8*mh&Ge!l5>l==zE=mS*hB6T1#4Q_dVd2d+<>eRAx zCg$D@v1LzNj$J}N)0$}D(eHZORa`<4;P6nISgdr24zva^j@OX+E1Em{x~=oGVrX9jff;2}uIWmA$lc zp>C6&#Z9`ZV9`gYkp=A&uioZatmEBm*RA7y*&;PWXjnpnfqI6T;=O)JZPW;pj46C9!u15}8L(J*&7_$az(yzUQ@0`EPbLwz!$N>d06@(a*-aas ziBEX-^*}=-v=jwYL}N`nwzs!EAyj$Y8yl65`UQU+8VDoytKYDgxFRSl54-Q|OO-9K zw7(==vW5K+CY0X6QpLX+nFvi}kj`24_^8oC*Sw~zgv&cgl9;P>I%h0gAW@k0F^2*z z%c$mSW-#KfsvcCW6^_8DChAZ^n6l5%$mOUm-K^(~Z4QkJ)oFfojSs zbe4m%ALz09Kwucn(aPl^<2HAIMxPtvtps{YpatC5adGXVlgpEXvg?&h2QpR%i1H0T zTAG;ip$D-M?R$pz(K}r%cD<~ZHfP$RfRHJQ7X+s375oX=3mp8y$M0i$$;}m=uhk-y z3G+0bPVxY1ML%+UF9%kuo5|xcb~ea;JYg)+hL(vMe`n@BV^*KL>LDejbcT(RhuN-n zoSAidO#0D9V7^+Gw#g@JsZvqRg_YbM^{hd>?{k6jj)5EdftzQPl{y1c3!)?suH>w; zez|=>{0WtB{Z}1#<}=BQ+Cc(Tj%wn!)Kva11*`w$v7!A>L!p~{HOwc9--?FV0m|8H ziF6Ers zguspX%)wMIuWS6N?BqOXPQ%pvM>P6+&_5kF{|bVex)HceM;I#8zP;Ys+>B_Y++P_P zh2(@DVh^rh9vQ@^ov}~4Wb!obBZQV!hS0X4*p%`=k=voNdh`U`ta{iGp}FDV+9KH+P>YPvznPQT^j7y3OaS?JCY;#)-Hq>M zu^G_E1t?eSexMGw6Cn>DfS>k!&*GNl)>5h9!%Zy*5r6gwTM&SXhQLhXsQa&vOSV|cj$@Zi>kl$kuhEcx%qkt>C+@td3ZpuF0*MAOKi!o}`}yVIoG@P$+Y6wXDTr(E5-Y2x6Y`e7&8#^`yL}W_!%3 z%z|D;M`H2YC7>h>-kX1X8^02-iSp#W20-4#U(hAhFSU)02ldZS3Ibqf8hMt=iXR}F zlrx#Nke}`T{migs=w=EOZPp#Hil=@kO5w-0lpI&Lxv@4-eyo!CGixUqX0|+-#@?Ti$|CZN+H4MZ4u;93C*OcGZ-{cRe?OX20 z=3zimS1W|+-Z)}j|4QXMbZ%+-i8y7`58KX(>oQ6R-vh=nQ=XOrWD)|Q)A`qN{lw{0 zKx3m2v?KakqjP98KP?CHGT^Zzo-ASq^WNFOc})cvE2mze+^|d6qm!;wEnTg`I!W*L z&%o~#si#Ys&d%b1nL(3`!fvD--K%>r40BTEp#MC|)P4By0gdL|vHYppVTA)O-d&RZ zInIz4Mn2;2_-!!9ew~xS@tMz7S% zW)e$$$4WMigL+k0*zSM6e)!J@X!8| Date: Fri, 13 Nov 2026 17:25:12 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=C3=85tg=C3=A4rda=20granskning=20av=20verif?= =?UTF-8?q?ikationsverktygsf=C3=A4ltet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipsa/accounting/ui/VoucherPanel.groovy | 35 ++---- .../accounting/ui/VoucherToolbar.groovy | 57 ++++++++-- .../accounting/ui/VoucherToolbarPanel.groovy | 47 ++++++++ .../main/resources/i18n/messages.properties | 5 +- .../resources/i18n/messages_sv.properties | 5 +- app/src/main/resources/icons/voucher/void.svg | 8 -- .../ui/VoucherPanelHeaderLayoutTest.groovy | 92 +++++++++++++++- .../ui/VoucherPanelNavigationTest.groovy | 8 +- .../accounting/ui/VoucherToolbarTest.groovy | 101 ++++++++++++++---- .../issue-125/voucher-toolbar-dark.png | Bin 11985 -> 11978 bytes .../issue-125/voucher-toolbar-light.png | Bin 12322 -> 12242 bytes .../issue-125/voucher-toolbar-narrow-sv.png | Bin 0 -> 5872 bytes .../issue-125/voucher-toolbar-saved-light.png | Bin 0 -> 11804 bytes .../voucher-toolbar-windows-dark.png | Bin 6379 -> 9890 bytes .../voucher-toolbar-windows-light.png | Bin 6680 -> 10255 bytes .../voucher-toolbar-windows-narrow-sv.png | Bin 0 -> 5048 bytes .../voucher-toolbar-windows-saved-light.png | Bin 0 -> 9914 bytes 17 files changed, 285 insertions(+), 73 deletions(-) create mode 100644 app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy delete mode 100644 app/src/main/resources/icons/voucher/void.svg create mode 100644 docs/screenshots/issue-125/voucher-toolbar-narrow-sv.png create mode 100644 docs/screenshots/issue-125/voucher-toolbar-saved-light.png create mode 100644 docs/screenshots/issue-125/voucher-toolbar-windows-narrow-sv.png create mode 100644 docs/screenshots/issue-125/voucher-toolbar-windows-saved-light.png diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy index ad4ffa9b..fde6be66 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy @@ -2,7 +2,6 @@ package se.alipsa.accounting.ui import groovy.transform.PackageScope -import com.formdev.flatlaf.FlatClientProperties import com.formdev.flatlaf.util.SystemFileChooser import com.formdev.flatlaf.util.UIScale @@ -145,7 +144,6 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste private JButton printButton private JButton duplicateButton private JButton correctionButton - private JButton voidButton private JButton addAttachmentButton private JButton openAttachmentButton private JButton newSeriesButton @@ -343,7 +341,7 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste } private JPanel buildNavigationToolbar() { - JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 6, 2)) + JPanel panel = new VoucherToolbarPanel() firstButton = VoucherToolbar.button('first', 'voucherPanel.button.first') { navigateFirst() } panel.add(firstButton) @@ -382,24 +380,11 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste } panel.add(correctionButton) - voidButton = VoucherToolbar.button('void', 'voucherPanel.button.void') { deleteOrCancelVoucher() } - voidButton.putClientProperty(FlatClientProperties.STYLE, - 'minimumWidth: 34; minimumHeight: 34; foreground: $Actions.Red') - JPanel toolbar = new JPanel(new BorderLayout(18, 0)) - toolbar.add(panel, BorderLayout.CENTER) - JPanel deleteGroup = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 2)) - deleteGroup.add(voidButton) - toolbar.add(deleteGroup, BorderLayout.EAST) - toolbar + panel } private void addSaveControls(JPanel panel) { - saveButton = VoucherToolbar.button('save', 'voucherPanel.button.save') { voucherEditorActions.save() } - saveButton.text = I18n.instance.getString('voucherPanel.button.save') - saveButton.margin = new Insets(0, 10, 0, 10) - saveButton.putClientProperty(FlatClientProperties.STYLE, - 'minimumHeight: 34; background: $List.selectionBackground; foreground: $List.selectionForeground; focusedBackground: $List.selectionBackground') - resizeSaveButton() + saveButton = VoucherToolbar.saveButton { voucherEditorActions.save() } panel.add(saveButton) panel.add(advanceAfterSaveToggle) } @@ -1252,7 +1237,6 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste saveButton.enabled = !readOnly printButton.enabled = true duplicateButton.enabled = currentVoucher != null - voidButton.enabled = false correctionButton.enabled = currentVoucher != null && currentVoucher.accountingDate != null && currentVoucher.status == VoucherStatus.ACTIVE @@ -1507,13 +1491,11 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste VoucherToolbar.updateLabel(lastButton, 'voucherPanel.button.last') VoucherToolbar.updateLabel(saveButton, 'voucherPanel.button.save') saveButton.text = I18n.instance.getString('voucherPanel.button.save') - resizeSaveButton() - VoucherToolbar.updateLabel(advanceAfterSaveToggle, 'voucherPanel.checkbox.advanceAfterSave') - VoucherToolbar.updateLabel(datePicker.calendarButton, 'voucherPanel.label.date') + VoucherToolbar.updateAdvanceToggleLabel(advanceAfterSaveToggle) + VoucherToolbar.updateLabel(datePicker.calendarButton, 'voucherPanel.button.chooseDate') VoucherToolbar.updateLabel(printButton, 'voucherPanel.button.print') VoucherToolbar.updateLabel(duplicateButton, 'voucherPanel.button.duplicate') VoucherToolbar.updateLabel(correctionButton, 'voucherPanel.button.createCorrection') - VoucherToolbar.updateLabel(voidButton, 'voucherPanel.button.void') VoucherToolbar.updateLabel(newSeriesButton, 'voucherPanel.button.newSeries') addAttachmentButton.text = I18n.instance.getString('voucherPanel.button.addAttachment') openAttachmentButton.text = I18n.instance.getString('voucherPanel.button.openAttachment') @@ -1543,18 +1525,13 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste } } - private void resizeSaveButton() { - saveButton.preferredSize = null - saveButton.preferredSize = new Dimension(saveButton.preferredSize.width as int, UIScale.scale(34)) - } - private static DatePicker createDatePicker() { // DatePicker's null bounds default to a fixed ±20-year range calculated at construction. // Use explicit bounds so historical vouchers and AI drafts are not silently rejected. DatePicker picker = new DatePicker( DATE_PICKER_RANGE_FROM, DATE_PICKER_RANGE_TO, null, I18n.instance.locale) picker.textFieldPosition = TextFieldPosition.LEFT - VoucherToolbar.configure(picker.calendarButton, 'calendar', 'voucherPanel.label.date') + VoucherToolbar.configure(picker.calendarButton, 'calendar', 'voucherPanel.button.chooseDate') picker } diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy index b2c2c712..dd5d3cf4 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy @@ -23,33 +23,51 @@ final class VoucherToolbar { private VoucherToolbar() { } static JButton button(String iconName, String labelKey, Closure action) { - JButton button = new JButton() + JButton button = new CommandButton() configure(button, iconName, labelKey) button.addActionListener { action.call() } button } - static JToggleButton advanceToggle() { - JToggleButton button = new JToggleButton() - configure(button, 'new-after-save', 'voucherPanel.checkbox.advanceAfterSave') + static JButton saveButton(Closure action) { + JButton button = button('save', 'voucherPanel.button.save', action) + button.text = I18n.instance.getString('voucherPanel.button.save') + button.margin = new Insets(0, 10, 0, 10) button.putClientProperty(FlatClientProperties.STYLE, - 'minimumWidth: 34; minimumHeight: 34; selectedBackground: $List.selectionBackground; selectedForeground: $List.selectionForeground') + 'background: $List.selectionBackground; foreground: $List.selectionForeground; focusedBackground: $List.selectionBackground') + button + } + + static JToggleButton advanceToggle() { + JToggleButton button = new CommandToggleButton() + configure(button, 'new-after-save', 'voucherPanel.toggle.advanceAfterSave') + button.margin = new Insets(0, 8, 0, 8) + button.addItemListener { updateAdvanceToggleLabel(button) } button.selected = true button } + static void updateAdvanceToggleLabel(JToggleButton button) { + updateLabel(button, 'voucherPanel.toggle.advanceAfterSave') + String state = button.selected ? 'on' : 'off' + button.text = I18n.instance.getString("voucherPanel.toggle.advanceAfterSave.${state}") + } + static void configure(AbstractButton button, String iconName, String labelKey) { FlatSVGIcon icon = new FlatSVGIcon("icons/voucher/${iconName}.svg", 16, 16) icon.setColorFilter(new FlatSVGIcon.ColorFilter({ Component component, Color ignored -> + if (component != null && !component.enabled) { + return UIManager.getColor('Button.disabledText') + } if (component instanceof JToggleButton && component.selected) { - return UIManager.getColor('List.selectionForeground') + return UIManager.getColor('ToggleButton.selectedForeground') ?: component.foreground } component?.foreground ?: UIManager.getColor('Label.foreground') } as BiFunction)) button.icon = icon + // The filter already supplies the disabled color; avoid applying a second gray filter. + button.disabledIcon = icon button.margin = new Insets(0, 0, 0, 0) - button.preferredSize = UIScale.scale(new Dimension(34, 34)) - button.putClientProperty(FlatClientProperties.STYLE, 'minimumWidth: 34; minimumHeight: 34') updateLabel(button, labelKey) } @@ -58,4 +76,27 @@ final class VoucherToolbar { button.toolTipText = label button.accessibleContext.accessibleName = label } + + private static Dimension commandSize(Dimension preferred) { + int minimum = UIScale.scale(34) + new Dimension(Math.max(minimum, preferred.width as int), Math.max(minimum, preferred.height as int)) + } + + /** Recompute command sizing from the current font and UI scale on every layout. */ + private static final class CommandButton extends JButton { + + @Override + Dimension getPreferredSize() { + commandSize(super.getPreferredSize()) + } + } + + /** Keep labelled mode controls aligned with commands without fixing their text width. */ + private static final class CommandToggleButton extends JToggleButton { + + @Override + Dimension getPreferredSize() { + commandSize(super.getPreferredSize()) + } + } } diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy new file mode 100644 index 00000000..560aea7b --- /dev/null +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy @@ -0,0 +1,47 @@ +package se.alipsa.accounting.ui + +import com.formdev.flatlaf.util.UIScale + +import java.awt.Component +import java.awt.Dimension +import java.awt.FlowLayout +import java.awt.Insets + +import javax.swing.JPanel + +/** Reserves the height of wrapped command rows when placed in BorderLayout.NORTH. */ +final class VoucherToolbarPanel extends JPanel { + + VoucherToolbarPanel() { + super(new FlowLayout(FlowLayout.LEFT, UIScale.scale(6), UIScale.scale(2))) + } + + @Override + Dimension getPreferredSize() { + Dimension natural = super.getPreferredSize() + if (parent == null || parent.width <= 0) { + return natural + } + FlowLayout flow = layout as FlowLayout + Insets padding = insets + int available = parent.width - parent.insets.left - parent.insets.right + - padding.left - padding.right - 2 * flow.hgap + int height = padding.top + padding.bottom + 2 * flow.vgap + int rowWidth = 0 + int rowHeight = 0 + for (Component component : components) { + if (!component.visible) { + continue + } + Dimension size = component.preferredSize + if (rowWidth > 0 && rowWidth + flow.hgap + size.width > available) { + height += rowHeight + flow.vgap + rowWidth = 0 + rowHeight = 0 + } + rowWidth += (rowWidth > 0 ? flow.hgap : 0) + (size.width as int) + rowHeight = Math.max(rowHeight, size.height as int) + } + new Dimension(natural.width as int, height + rowHeight) + } +} diff --git a/app/src/main/resources/i18n/messages.properties b/app/src/main/resources/i18n/messages.properties index 36c8191b..c53bfa5a 100644 --- a/app/src/main/resources/i18n/messages.properties +++ b/app/src/main/resources/i18n/messages.properties @@ -852,7 +852,10 @@ voucherPanel.button.next=Next voucher voucherPanel.button.first=First voucher voucherPanel.button.last=Last voucher voucherPanel.button.save=Save -voucherPanel.checkbox.advanceAfterSave=New voucher after save +voucherPanel.toggle.advanceAfterSave=New voucher after save +voucherPanel.toggle.advanceAfterSave.on=New after save: On +voucherPanel.toggle.advanceAfterSave.off=New after save: Off +voucherPanel.button.chooseDate=Choose date voucherPanel.button.print=Print voucher voucherPanel.button.removeLine=Remove line voucherPanel.button.duplicate=Duplicate diff --git a/app/src/main/resources/i18n/messages_sv.properties b/app/src/main/resources/i18n/messages_sv.properties index bf8ffde9..25481295 100644 --- a/app/src/main/resources/i18n/messages_sv.properties +++ b/app/src/main/resources/i18n/messages_sv.properties @@ -852,7 +852,10 @@ voucherPanel.button.next=Nästa verifikat voucherPanel.button.first=Första verifikatet voucherPanel.button.last=Sista verifikatet voucherPanel.button.save=Spara -voucherPanel.checkbox.advanceAfterSave=Nytt verifikat efter sparning +voucherPanel.toggle.advanceAfterSave=Nytt verifikat efter sparning +voucherPanel.toggle.advanceAfterSave.on=Nytt efter sparning: På +voucherPanel.toggle.advanceAfterSave.off=Nytt efter sparning: Av +voucherPanel.button.chooseDate=Välj datum voucherPanel.button.print=Skriv ut verifikation voucherPanel.button.removeLine=Ta bort rad voucherPanel.button.duplicate=Duplicera diff --git a/app/src/main/resources/icons/voucher/void.svg b/app/src/main/resources/icons/voucher/void.svg deleted file mode 100644 index 02b83ecb..00000000 --- a/app/src/main/resources/icons/voucher/void.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy index 74c262b5..dbd7d320 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy @@ -1,13 +1,21 @@ package se.alipsa.accounting.ui -import static org.junit.jupiter.api.Assertions.assertEquals +import static org.junit.jupiter.api.Assertions.* +import com.formdev.flatlaf.extras.FlatSVGIcon import org.junit.jupiter.api.Test +import se.alipsa.accounting.support.I18n import se.alipsa.datepicker.DatePicker +import java.awt.Component import java.awt.Container +import javax.swing.AbstractButton +import javax.swing.JButton +import javax.swing.JTabbedPane +import javax.swing.JToggleButton + final class VoucherPanelHeaderLayoutTest extends VoucherPanelTestSupport { @Test @@ -27,4 +35,86 @@ final class VoucherPanelHeaderLayoutTest extends VoucherPanelTestSupport { assertEquals(datePicker.textField.preferredSize.width as int, datePicker.textField.width) } } + + @Test + void realCommandsAndCalendarHaveSvgIconsAndTranslatedActionNames() { + withLocales { + onEdt { + Map actions = [first: 'first', prev: 'prev', next: 'next', last: 'last', + save: 'save', print: 'print', duplicate: 'duplicate', correction: 'createCorrection', 'new-series': 'newSeries'] + actions.each { String iconName, String action -> + String label = I18n.instance.getString("voucherPanel.button.${action}") + JButton button = findComponent(panel, JButton) { JButton candidate -> candidate.toolTipText == label } + assertEquals(label, button.accessibleContext.accessibleName) + assertSvg(button, iconName) + } + DatePicker picker = findComponent(panel, DatePicker) { true } + String chooseDate = I18n.instance.getString('voucherPanel.button.chooseDate') + assertEquals(chooseDate, picker.calendarButton.toolTipText) + assertEquals(chooseDate, picker.calendarButton.accessibleContext.accessibleName) + assertNotEquals(I18n.instance.getString('voucherPanel.label.date'), chooseDate) + assertSvg(picker.calendarButton, 'calendar') + JToggleButton toggle = findComponent(panel, JToggleButton) { true } + assertSvg(toggle, 'new-after-save') + assertEquals(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave'), toggle.toolTipText) + assertEquals(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.on'), toggle.text) + assertTrue(toggle.selected) + VoucherToolbarPanel toolbar = findComponent(panel, VoucherToolbarPanel) { true } + assertFalse(toolbar.components.any { Component child -> + child instanceof AbstractButton && child.toolTipText == I18n.instance.getString('voucherPanel.button.void') + }) + } + } + } + + @Test + void wrappedCommandsRemainVisibleAtNarrowWidthsInBothLanguages() { + withLocales { + onEdt { + VoucherToolbarPanel toolbar = findComponent(panel, VoucherToolbarPanel) { true } + JTabbedPane tabs = findComponent(panel, JTabbedPane) { true } + [1200, 900, 800, 700, 600, 400, 1200].each { int width -> + panel.setSize(width, 600) + layoutTree(panel) + toolbar.components.findAll { Component child -> child.visible }.each { Component child -> + assertTrue(child.x >= 0 && child.x + child.width <= toolbar.width, + "Command must fit horizontally at width ${width}".toString()) + assertTrue(child.y >= 0 && child.y + child.height <= toolbar.height, + "Wrapped command must fit vertically at width ${width}".toString()) + } + assertTrue(tabs.y >= toolbar.y + toolbar.height) + } + } + } + } + + private void withLocales(Closure test) { + Locale original = I18n.instance.locale + try { + [Locale.ENGLISH, Locale.forLanguageTag('sv')].each { Locale locale -> + onEdt { I18n.instance.locale = locale } + onEdt { null } // Drain the queued label refresh before inspecting the controls. + test.call() + } + } finally { + onEdt { I18n.instance.locale = original } + onEdt { null } + } + } + + private static void assertSvg(AbstractButton button, String iconName) { + assertInstanceOf(FlatSVGIcon, button.icon) + FlatSVGIcon icon = button.icon as FlatSVGIcon + assertTrue(icon.hasFound()) + assertEquals("icons/voucher/${iconName}.svg".toString(), icon.name) + } + + private static void layoutTree(Container container) { + container.doLayout() + container.components.each { Component child -> + if (child instanceof Container) { + layoutTree(child) + } + } + } } diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy index 0c120e08..55b051b4 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy @@ -212,8 +212,8 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { assertEquals('Försäljning', onEdt { panel.lineTableModel.rows[1].accountName }) assertEquals('Rad två', onEdt { panel.lineTableModel.rows[1].description }) - JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton checkBox -> - checkBox.toolTipText == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') + JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton toggle -> + toggle.toolTipText == I18n.instance.getString('voucherPanel.toggle.advanceAfterSave') } assertTrue(onEdt { advanceAfterSave.selected }) onEdt { @@ -284,8 +284,8 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { void savingWithDefaultAdvanceAfterSaveShowsANewBlankDraft() { JTextField description = findComponent(panel, JTextField) { JTextField field -> field.columns == 30 } JTextField voucherJumpField = findComponent(panel, JTextField) { JTextField field -> field.columns == 8 } - JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton checkBox -> - checkBox.toolTipText == I18n.instance.getString('voucherPanel.checkbox.advanceAfterSave') + JToggleButton advanceAfterSave = findComponent(panel, JToggleButton) { JToggleButton toggle -> + toggle.toolTipText == I18n.instance.getString('voucherPanel.toggle.advanceAfterSave') } JLabel unsaved = findComponent(panel, JLabel) { JLabel label -> label.text == I18n.instance.getString('voucherPanel.label.unsaved') diff --git a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy index 0b4b86de..01a991ae 100644 --- a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy +++ b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy @@ -8,10 +8,16 @@ import com.formdev.flatlaf.extras.FlatSVGIcon import com.formdev.flatlaf.util.UIScale import org.junit.jupiter.api.Test +import se.alipsa.accounting.support.I18n + import java.awt.Color +import java.awt.Graphics2D import java.awt.image.BufferedImage +import javax.swing.AbstractButton +import javax.swing.Icon import javax.swing.JButton +import javax.swing.JToggleButton import javax.swing.LookAndFeel import javax.swing.SwingUtilities import javax.swing.UIManager @@ -19,30 +25,71 @@ import javax.swing.UIManager final class VoucherToolbarTest { @Test - void svgCommandsHaveConsistentSizesAndFollowForegroundInBothThemes() { + void commandIconsLoadAndFollowComponentForegroundInBothThemes() { + withThemes { + Map actions = [first: 'first', prev: 'prev', next: 'next', last: 'last', + print: 'print', duplicate: 'duplicate', correction: 'createCorrection', 'new-series': 'newSeries'] + actions.each { String iconName, String action -> + String label = I18n.instance.getString("voucherPanel.button.${action}") + JButton button = VoucherToolbar.button(iconName, "voucherPanel.button.${action}") { null } + assertTrue((button.icon as FlatSVGIcon).hasFound()) + assertEquals(UIScale.scale(34), button.preferredSize.height as int) + assertEquals(UIScale.scale(34), button.preferredSize.width as int) + assertEquals(label, button.toolTipText) + assertEquals(label, button.accessibleContext.accessibleName) + button.foreground = Color.MAGENTA + assertIconColor(button, Color.MAGENTA) + } + } + } + + @Test + void disabledSaveIconUsesDisabledTextWithoutAnAdditionalGrayFilter() { + withThemes { + JButton button = VoucherToolbar.saveButton { null } + assertIconColor(button, button.foreground) + button.enabled = false + assertIconColor(button, UIManager.getColor('Button.disabledText')) + } + } + + @Test + void advanceToggleShowsItsStateInTextAndUsesTheThemeToggleForeground() { + withThemes { + JToggleButton toggle = VoucherToolbar.advanceToggle() + assertTrue(toggle.selected) + assertEquals(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.on'), toggle.text) + assertIconColor(toggle, UIManager.getColor('ToggleButton.selectedForeground') ?: toggle.foreground) + toggle.enabled = false + assertIconColor(toggle, UIManager.getColor('Button.disabledText')) + toggle.enabled = true + toggle.doClick() + assertFalse(toggle.selected) + assertEquals(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.off'), toggle.text) + assertIconColor(toggle, toggle.foreground) + } + } + + @Test + void labelledButtonsRecomputeTheirSizeWhenTheFontChanges() { + withThemes { + [VoucherToolbar.saveButton { null }, VoucherToolbar.advanceToggle()].each { AbstractButton button -> + int originalHeight = button.preferredSize.height as int + int originalWidth = button.preferredSize.width as int + button.font = button.font.deriveFont(36F) + assertTrue(button.preferredSize.height > originalHeight) + assertTrue(button.preferredSize.width > originalWidth) + } + } + } + + private static void withThemes(Closure test) { SwingUtilities.invokeAndWait { LookAndFeel original = UIManager.lookAndFeel try { [new FlatLightLaf(), new FlatDarkLaf()].each { LookAndFeel theme -> UIManager.setLookAndFeel(theme) - ['first', 'prev', 'next', 'last', 'save', 'new-after-save', 'print', - 'duplicate', 'correction', 'void', 'calendar', 'new-series'].each { String name -> - JButton button = VoucherToolbar.button(name, 'voucherPanel.button.save') { null } - FlatSVGIcon icon = button.icon as FlatSVGIcon - assertTrue(icon.hasFound(), "Missing voucher icon ${name}".toString()) - assertEquals(UIScale.scale(34), button.preferredSize.height as int) - assertEquals(UIScale.scale(34), button.preferredSize.width as int) - assertEquals(button.toolTipText, button.accessibleContext.accessibleName) - button.foreground = Color.MAGENTA - BufferedImage image = new BufferedImage(icon.iconWidth, icon.iconHeight, BufferedImage.TYPE_INT_ARGB) - def graphics = image.createGraphics() - try { - icon.paintIcon(button, graphics, 0, 0) - } finally { - graphics.dispose() - } - assertTrue(hasForeground(image), "Voucher icon ${name} must use the component foreground".toString()) - } + test.call() } } finally { UIManager.setLookAndFeel(original) @@ -50,11 +97,23 @@ final class VoucherToolbarTest { } } - private static boolean hasForeground(BufferedImage image) { + private static void assertIconColor(AbstractButton button, Color color) { + Icon icon = button.enabled ? button.icon : button.disabledIcon + BufferedImage image = new BufferedImage(icon.iconWidth, icon.iconHeight, BufferedImage.TYPE_INT_ARGB) + Graphics2D graphics = image.createGraphics() + try { + icon.paintIcon(button, graphics, 0, 0) + } finally { + graphics.dispose() + } + assertTrue(containsColor(image, color), "Icon must render with ${color}".toString()) + } + + private static boolean containsColor(BufferedImage image, Color color) { for (int y = 0; y < image.height; y++) { for (int x = 0; x < image.width; x++) { Color pixel = new Color(image.getRGB(x, y), true) - if (pixel.alpha > 0 && pixel.red == 255 && pixel.green == 0 && pixel.blue == 255) { + if (pixel.alpha > 0 && pixel.red == color.red && pixel.green == color.green && pixel.blue == color.blue) { return true } } diff --git a/docs/screenshots/issue-125/voucher-toolbar-dark.png b/docs/screenshots/issue-125/voucher-toolbar-dark.png index d0b9b69d7ce9412368e98a0aabd4e1293709aeaa..84993995dcae855be03e0641eef266e8d6f66a7b 100644 GIT binary patch literal 11978 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 JrK0cs{|n#U1r7iJ literal 11985 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 ecnCz?pyR4tOT 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 JDsJ@Ve*sj)p>zNM literal 12322 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%0Dfxzr0XNLHdTP**z& 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 literal 0 HcmV?d00001 diff --git a/docs/screenshots/issue-125/voucher-toolbar-saved-light.png b/docs/screenshots/issue-125/voucher-toolbar-saved-light.png new file mode 100644 index 0000000000000000000000000000000000000000..bff8c9417007629a217656287ec2356a49787b78 GIT binary patch literal 11804 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 NC3$tZGN?K1e*m0t6Ey$; literal 0 HcmV?d00001 diff --git a/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png b/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png index 55f3ebe2122b2ae3cc5065820bbc43b841652685..d9808962920a4c025a42156e39f243560804f702 100644 GIT binary patch literal 9890 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 SoEG5(o$7bAm5X5y1OEdhF{}mv literal 6379 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 literal 0 HcmV?d00001 diff --git a/docs/screenshots/issue-125/voucher-toolbar-windows-saved-light.png b/docs/screenshots/issue-125/voucher-toolbar-windows-saved-light.png new file mode 100644 index 0000000000000000000000000000000000000000..2dc6b1da9d9ad25cae74871db5feb63718b4ba6e GIT binary patch literal 9914 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

-S%2J}RpK literal 0 HcmV?d00001 From 40aa75484c0e9e51f834352d6a885154a7d6752c Mon Sep 17 00:00:00 2001 From: Per Nyfelt Date: Fri, 13 Nov 2026 17:53:08 +0100 Subject: [PATCH 4/5] =?UTF-8?q?R=C3=A4tta=20radbrytning=20och=20stabiliser?= =?UTF-8?q?a=20verktygsf=C3=A4ltet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alipsa/accounting/ui/VoucherPanel.groovy | 38 ------------ .../accounting/ui/VoucherToolbar.groovy | 9 ++- .../accounting/ui/VoucherToolbarPanel.groovy | 6 +- .../main/resources/i18n/messages.properties | 3 - .../resources/i18n/messages_sv.properties | 3 - .../ui/VoucherPanelHeaderLayoutTest.groovy | 20 +++++-- .../ui/VoucherPanelNavigationTest.groovy | 54 ------------------ .../ui/VoucherToolbarPanelTest.groovy | 47 +++++++++++++++ .../accounting/ui/VoucherToolbarTest.groovy | 40 +++++++++++++ .../issue-125/voucher-toolbar-dark.png | Bin 11978 -> 11977 bytes .../issue-125/voucher-toolbar-light.png | Bin 12242 -> 12243 bytes .../voucher-toolbar-windows-dark.png | Bin 9890 -> 9890 bytes .../voucher-toolbar-windows-light.png | Bin 10255 -> 10256 bytes .../voucher-toolbar-windows-narrow-sv.png | Bin 5048 -> 5052 bytes 14 files changed, 114 insertions(+), 106 deletions(-) create mode 100644 app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarPanelTest.groovy diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy index fde6be66..944034bf 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherPanel.groovy @@ -108,11 +108,6 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste showRecorrectionConfirmDialog(existingNumbers) } - @PackageScope - Closure cannotDeleteConfirmer = { Voucher voucher -> - showCannotDeleteConfirmDialog(voucher) - } - private final JLabel voucherNumberLabel = new JLabel('') private final JLabel unsavedLabel = new JLabel() private final DatePicker datePicker = createDatePicker() @@ -1134,28 +1129,6 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste dateFocusRequester.call() } - @PackageScope - void deleteOrCancelVoucher() { - if (currentVoucher == null) { - return - } - List existingCorrectionNumbers = voucherService.findCorrectionVoucherNumbers(currentVoucher.id) - if (!confirmRecorrectionIfNeeded(existingCorrectionNumbers)) { - return - } - try { - if (existingCorrectionNumbers.isEmpty() && !cannotDeleteConfirmer.call(currentVoucher)) { - return - } - Voucher correction = voucherService.createCorrectionVoucher(currentVoucher.id, null) - showInfo(I18n.instance.format('voucherPanel.message.correctionCreated', - correction.voucherNumber ?: '')) - reloadVoucherList() - } catch (Exception ex) { - showError(ex.message ?: I18n.instance.getString('voucherPanel.error.voidFailed')) - } - } - @PackageScope static boolean shouldProceedWithRecorrection(List existingCorrectionNumbers, boolean confirmed) { existingCorrectionNumbers.isEmpty() || confirmed @@ -1182,17 +1155,6 @@ final class VoucherPanel extends JPanel implements PropertyChangeListener, Liste choice == javax.swing.JOptionPane.YES_OPTION } - private boolean showCannotDeleteConfirmDialog(Voucher voucher) { - int choice = javax.swing.JOptionPane.showConfirmDialog( - this, - I18n.instance.getString('voucherPanel.confirm.cannotDelete') - .replace('{0}', voucher.voucherNumber ?: ''), - I18n.instance.getString('voucherPanel.button.void'), - javax.swing.JOptionPane.YES_NO_OPTION - ) - choice == javax.swing.JOptionPane.YES_OPTION - } - private void removeSelectedLine() { int selectedRow = lineTable.selectedRow if (lineTable.editing) { diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy index dd5d3cf4..021db591 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy @@ -9,6 +9,7 @@ import se.alipsa.accounting.support.I18n import java.awt.Color import java.awt.Component import java.awt.Dimension +import java.awt.FontMetrics import java.awt.Insets import java.util.function.BiFunction @@ -96,7 +97,13 @@ final class VoucherToolbar { @Override Dimension getPreferredSize() { - commandSize(super.getPreferredSize()) + Dimension preferred = super.getPreferredSize() + FontMetrics metrics = getFontMetrics(font) + int widestLabel = Math.max( + metrics.stringWidth(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.on')), + metrics.stringWidth(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.off'))) + int extraWidth = Math.max(0, widestLabel - metrics.stringWidth(text ?: '')) + commandSize(new Dimension((preferred.width as int) + extraWidth, preferred.height as int)) } } } diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy index 560aea7b..0b915141 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbarPanel.groovy @@ -24,8 +24,8 @@ final class VoucherToolbarPanel extends JPanel { } FlowLayout flow = layout as FlowLayout Insets padding = insets - int available = parent.width - parent.insets.left - parent.insets.right - - padding.left - padding.right - 2 * flow.hgap + int available = parent.width - parent.insets.left - parent.insets.right - + padding.left - padding.right - 2 * flow.hgap int height = padding.top + padding.bottom + 2 * flow.vgap int rowWidth = 0 int rowHeight = 0 @@ -34,7 +34,7 @@ final class VoucherToolbarPanel extends JPanel { continue } Dimension size = component.preferredSize - if (rowWidth > 0 && rowWidth + flow.hgap + size.width > available) { + if (rowWidth > 0 && rowWidth + size.width > available) { height += rowHeight + flow.vgap rowWidth = 0 rowHeight = 0 diff --git a/app/src/main/resources/i18n/messages.properties b/app/src/main/resources/i18n/messages.properties index c53bfa5a..c3c52300 100644 --- a/app/src/main/resources/i18n/messages.properties +++ b/app/src/main/resources/i18n/messages.properties @@ -860,7 +860,6 @@ voucherPanel.button.print=Print voucher voucherPanel.button.removeLine=Remove line voucherPanel.button.duplicate=Duplicate voucherPanel.button.createCorrection=Create correction -voucherPanel.button.void=Delete voucher voucherPanel.button.addAttachment=Add attachment... voucherPanel.button.openAttachment=Open attachment... voucherPanel.tab.lines=Lines @@ -880,13 +879,11 @@ voucherPanel.message.deleted=Voucher {0} deleted. voucherPanel.message.voided=Voucher {0} voided. voucherPanel.message.printed=Voucher {0} was sent to the printer. voucherPanel.confirm.delete=Delete voucher {0}? -voucherPanel.confirm.cannotDelete=Voucher {0} cannot be deleted because there are later vouchers in the series. Would you like to create a correction voucher that cancels it instead? voucherPanel.confirm.alreadyCorrected=This voucher was already corrected by {0}. Would you like to create another correction anyway? voucherPanel.confirm.alreadyCorrected.title=Confirm correction voucherPanel.message.correctionCreated=Correction created as {0}. voucherPanel.message.duplicateCreated=Draft copy created. Choose a date and save. voucherPanel.error.saveFailed=The voucher could not be saved. -voucherPanel.error.voidFailed=The voucher could not be voided. voucherPanel.error.correctionFailed=The correction could not be created. voucherPanel.error.existingVoucherReadOnly=Recorded vouchers are read-only. Create a correction voucher instead. voucherPanel.error.noFiscalYear=Select a fiscal year before registering vouchers. diff --git a/app/src/main/resources/i18n/messages_sv.properties b/app/src/main/resources/i18n/messages_sv.properties index 25481295..0f5c195b 100644 --- a/app/src/main/resources/i18n/messages_sv.properties +++ b/app/src/main/resources/i18n/messages_sv.properties @@ -860,7 +860,6 @@ voucherPanel.button.print=Skriv ut verifikation voucherPanel.button.removeLine=Ta bort rad voucherPanel.button.duplicate=Duplicera voucherPanel.button.createCorrection=Skapa korrigering -voucherPanel.button.void=Ta bort verifikation voucherPanel.button.addAttachment=Lägg till bilaga... voucherPanel.button.openAttachment=Öppna bilaga... voucherPanel.tab.lines=Rader @@ -880,13 +879,11 @@ voucherPanel.message.deleted=Verifikation {0} togs bort. voucherPanel.message.voided=Verifikation {0} makulerades. voucherPanel.message.printed=Verifikation {0} skickades till skrivaren. voucherPanel.confirm.delete=Ta bort verifikation {0}? -voucherPanel.confirm.cannotDelete=Verifikation {0} kan inte tas bort eftersom det finns senare verifikationer i serien. Vill du skapa en korrigeringsverifikation som tar ut den istället? voucherPanel.confirm.alreadyCorrected=Verifikationen har redan korrigerats av {0}. Vill du skapa ytterligare en korrigeringsverifikation ändå? voucherPanel.confirm.alreadyCorrected.title=Bekräfta korrigering voucherPanel.message.correctionCreated=Korrigering skapad som {0}. voucherPanel.message.duplicateCreated=Utkastkopia skapad. Välj datum och spara. voucherPanel.error.saveFailed=Verifikationen kunde inte sparas. -voucherPanel.error.voidFailed=Verifikationen kunde inte makuleras. voucherPanel.error.correctionFailed=Korrigeringen kunde inte skapas. voucherPanel.error.existingVoucherReadOnly=Registrerade verifikationer är skrivskyddade. Skapa en korrigeringsverifikation i stället. voucherPanel.error.noFiscalYear=Välj ett räkenskapsår innan verifikationer registreras. diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy index dbd7d320..ac81d8bc 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelHeaderLayoutTest.groovy @@ -10,6 +10,7 @@ import se.alipsa.datepicker.DatePicker import java.awt.Component import java.awt.Container +import java.awt.FlowLayout import javax.swing.AbstractButton import javax.swing.JButton @@ -60,9 +61,11 @@ final class VoucherPanelHeaderLayoutTest extends VoucherPanelTestSupport { assertEquals(I18n.instance.getString('voucherPanel.toggle.advanceAfterSave.on'), toggle.text) assertTrue(toggle.selected) VoucherToolbarPanel toolbar = findComponent(panel, VoucherToolbarPanel) { true } - assertFalse(toolbar.components.any { Component child -> - child instanceof AbstractButton && child.toolTipText == I18n.instance.getString('voucherPanel.button.void') - }) + Set commandIcons = toolbar.components.findAll { Component child -> + child instanceof AbstractButton + }.collect { Component child -> ((child as AbstractButton).icon as FlatSVGIcon).name }.toSet() + assertEquals(['first', 'prev', 'next', 'last', 'save', 'new-after-save', 'print', 'duplicate', 'correction'] + .collect { String name -> "icons/voucher/${name}.svg".toString() }.toSet(), commandIcons) } } } @@ -73,7 +76,8 @@ final class VoucherPanelHeaderLayoutTest extends VoucherPanelTestSupport { onEdt { VoucherToolbarPanel toolbar = findComponent(panel, VoucherToolbarPanel) { true } JTabbedPane tabs = findComponent(panel, JTabbedPane) { true } - [1200, 900, 800, 700, 600, 400, 1200].each { int width -> + JToggleButton toggle = findComponent(panel, JToggleButton) { true } + ((300..1300).toList() + [400, 300, 1300]).each { int width -> panel.setSize(width, 600) layoutTree(panel) toolbar.components.findAll { Component child -> child.visible }.each { Component child -> @@ -82,6 +86,14 @@ final class VoucherPanelHeaderLayoutTest extends VoucherPanelTestSupport { assertTrue(child.y >= 0 && child.y + child.height <= toolbar.height, "Wrapped command must fit vertically at width ${width}".toString()) } + int lastBottom = toolbar.components.collect { Component child -> child.y + child.height }.max() as int + assertEquals(lastBottom + toolbar.insets.bottom + (toolbar.layout as FlowLayout).vgap, toolbar.height, + "Toolbar must reserve exactly the wrapped rows at width ${width}".toString()) + def positions = toolbar.components.collect { Component child -> child.bounds } + toggle.selected = !toggle.selected + layoutTree(panel) + assertEquals(positions, toolbar.components.collect { Component child -> child.bounds }, + "Toggling must not move commands at width ${width}".toString()) assertTrue(tabs.y >= toolbar.y + toolbar.height) } } diff --git a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy index 55b051b4..e9141a45 100644 --- a/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy +++ b/app/src/test/groovy/integration/se/alipsa/accounting/ui/VoucherPanelNavigationTest.groovy @@ -646,60 +646,6 @@ final class VoucherPanelNavigationTest extends VoucherPanelTestSupport { assertFalse(onEdt { correctedBy.visible }) } - @Test - void deleteOrCancelVoucherSkipsCannotDeleteConfirmationForAlreadyCorrectedVoucher() { - Voucher original = voucherService.createVoucher( - fiscalYear.id, 'A', LocalDate.of(2030, 4, 8), 'Original', - [voucherLine('1510', 'Kundfordringar', '', 100.00G, 0.00G), - voucherLine('3010', 'Försäljning', '', 0.00G, 100.00G)] - ) - Voucher firstCorrection = voucherService.createCorrectionVoucher(original.id) - panel?.dispose() - panel = buildPanel() - boolean cannotDeleteConfirmationShown = false - panel.recorrectionConfirmer = { List existing -> true } - panel.cannotDeleteConfirmer = { Voucher voucher -> - cannotDeleteConfirmationShown = true - false - } - - onEdt { - clickButtonWithTooltip(panel, I18n.instance.getString('voucherPanel.button.prev')) - clickButtonWithTooltip(panel, I18n.instance.getString('voucherPanel.button.prev')) - panel.deleteOrCancelVoucher() - } - - assertFalse(cannotDeleteConfirmationShown) - assertEquals(2, voucherService.findCorrectionVoucherNumbers(original.id).size()) - assertEquals(firstCorrection.voucherNumber, - voucherService.findCorrectionVoucherNumbers(original.id).first()) - } - - @Test - void deleteOrCancelVoucherUsesCannotDeleteConfirmationBeforeFirstCorrection() { - Voucher original = voucherService.createVoucher( - fiscalYear.id, 'A', LocalDate.of(2030, 4, 9), 'Original', - [voucherLine('1510', 'Kundfordringar', '', 100.00G, 0.00G), - voucherLine('3010', 'Försäljning', '', 0.00G, 100.00G)] - ) - panel?.dispose() - panel = buildPanel() - int cannotDeleteConfirmationCount = 0 - panel.cannotDeleteConfirmer = { Voucher voucher -> - cannotDeleteConfirmationCount++ - cannotDeleteConfirmationCount > 1 - } - - onEdt { - clickButtonWithTooltip(panel, I18n.instance.getString('voucherPanel.button.prev')) - panel.deleteOrCancelVoucher() - panel.deleteOrCancelVoucher() - } - - assertEquals(2, cannotDeleteConfirmationCount) - assertEquals(1, voucherService.findCorrectionVoucherNumbers(original.id).size()) - } - @Test void printableVoucherHtmlContainsHeaderLinesAndTotals() { Voucher voucher = voucherService.createVoucher( diff --git a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarPanelTest.groovy b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarPanelTest.groovy new file mode 100644 index 00000000..d0c14ebf --- /dev/null +++ b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarPanelTest.groovy @@ -0,0 +1,47 @@ +package se.alipsa.accounting.ui + +import static org.junit.jupiter.api.Assertions.* + +import org.junit.jupiter.api.Test + +import java.awt.BorderLayout +import java.awt.Component +import java.awt.Dimension +import java.awt.FlowLayout + +import javax.swing.BorderFactory +import javax.swing.JButton +import javax.swing.JPanel +import javax.swing.SwingUtilities + +final class VoucherToolbarPanelTest { + + @Test + void wrappedHeightMatchesFlowLayoutWithPanelAndParentInsetsAtEveryWidth() { + SwingUtilities.invokeAndWait { + JPanel parent = new JPanel(new BorderLayout()) + parent.border = BorderFactory.createEmptyBorder(3, 7, 11, 13) + VoucherToolbarPanel toolbar = new VoucherToolbarPanel() + toolbar.border = BorderFactory.createEmptyBorder(4, 9, 6, 5) + [51, 88, 99, 34, 107, 68, 42].each { int width -> + JButton button = new JButton() + button.preferredSize = new Dimension(width, width == 88 ? 42 : 34) + toolbar.add(button) + } + parent.add(toolbar, BorderLayout.NORTH) + (200..1300).each { int width -> + parent.setSize(width, 600) + parent.doLayout() + toolbar.doLayout() + toolbar.components.each { Component child -> + assertTrue(child.x >= 0 && child.x + child.width <= toolbar.width) + assertTrue(child.y >= 0 && child.y + child.height <= toolbar.height, + "Wrapped row must fit at width ${width}".toString()) + } + int bottom = toolbar.components.collect { Component child -> child.y + child.height }.max() as int + assertEquals(bottom + toolbar.insets.bottom + (toolbar.layout as FlowLayout).vgap, toolbar.height, + "No extra blank row at width ${width}".toString()) + } + } + } +} diff --git a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy index 01a991ae..96b7109c 100644 --- a/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy +++ b/app/src/test/groovy/unit/se/alipsa/accounting/ui/VoucherToolbarTest.groovy @@ -20,6 +20,7 @@ import javax.swing.JButton import javax.swing.JToggleButton import javax.swing.LookAndFeel import javax.swing.SwingUtilities +import javax.swing.UIDefaults import javax.swing.UIManager final class VoucherToolbarTest { @@ -83,6 +84,45 @@ final class VoucherToolbarTest { } } + @Test + void advanceToggleHasTheSameWidthForBothStatesInBothLanguages() { + withThemes { + Locale original = I18n.instance.locale + try { + [Locale.ENGLISH, Locale.forLanguageTag('sv')].each { Locale locale -> + I18n.instance.locale = locale + JToggleButton toggle = VoucherToolbar.advanceToggle() + [12F, 36F].each { float fontSize -> + toggle.font = toggle.font.deriveFont(fontSize) + def selectedSize = toggle.preferredSize + toggle.selected = false + assertEquals(selectedSize, toggle.preferredSize) + toggle.selected = true + } + } + } finally { + I18n.instance.locale = original + } + } + } + + @Test + void selectedToggleIconHonorsADistinctThemeSelectionColor() { + withThemes { + UIDefaults defaults = UIManager.lookAndFeelDefaults + Object original = defaults.get('ToggleButton.selectedForeground') + try { + defaults.put('ToggleButton.selectedForeground', Color.MAGENTA) + JToggleButton toggle = VoucherToolbar.advanceToggle() + assertIconColor(toggle, Color.MAGENTA) + toggle.selected = false + assertIconColor(toggle, toggle.foreground) + } finally { + defaults.put('ToggleButton.selectedForeground', original) + } + } + } + private static void withThemes(Closure test) { SwingUtilities.invokeAndWait { LookAndFeel original = UIManager.lookAndFeel diff --git a/docs/screenshots/issue-125/voucher-toolbar-dark.png b/docs/screenshots/issue-125/voucher-toolbar-dark.png index 84993995dcae855be03e0641eef266e8d6f66a7b..0d9c7aeba6938db3f97ed45b6e96addd4cd87472 100644 GIT binary patch delta 5502 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 diff --git a/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png b/docs/screenshots/issue-125/voucher-toolbar-windows-dark.png index d9808962920a4c025a42156e39f243560804f702..225d2203329fa481273beec1034c41aba90bafba 100644 GIT binary patch delta 4657 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 XyZYzJ>_5?9{b_1!b?Fu2di*~Daj)0* delta 4642 zcmbVQc|4T++jgi7Qz%CSW$u`L{M#7MN z84RXIvP_srvL9KpuY(!u`^@Q_-@Ctmyw5++=ksje=f1x8ecjh}XIf=i6~7Z#0Y~kP z0!4w(IUvdq4PKX?&R&5HC#>f>dW0lRV!jm-bLbm;`S?z?$4`l0JORrn$v8;%8xgd) zb^gk7oKA3Nw-o8ts=i0kksJ+9*!Jo&8%5{i?c0HXDjg(iQ^X(%-${#B9t!ZawWbyGtv%9Z6pDDvK&Tp9ebmJaM7Z|z$Tgu$AVU4`2x;IC%i?{VVFgq^?5|wLj zVbWEY^m`PxN$*-3jq~!)lZ2UbpwZJv97%m9 z*XQWG{LY&~%rmK*!3(utgM{e$Dz9qibRc|a%#{PIHcC@ zw&U5bcs-}a9@N44XT`BXQ7=+RB%H;lN&fzw*bLrQbVjGqKD)qtdkS4%v6(&Jt7rN7 z_}~isWB}<&I0OskCrh=!agZz>P8)SWML2AI@NU5%9kq{vFX=e9y*1NqdW2hGsTfim zmk&P!gWazyHgojfnAI0P^egGCv2rTxZ&31r*B>wWOOCXIz{yJPfx_2Tu8(q&cK1e2 z9R1Bz=}(T&A{=t3=-IF*N{a*jC<CMH#rQ1Y|3w>u22G3F>;9}b_C(iDKoOJcni$2EBOmnS(WtK~`EZ*5Nz zW&oZFIKw{9w*%^zAp>Yu=GDZi*V(U`Bg2*|f5l+d8*?b5l(3gkA$uAsZY|GC#x9(u zSf~2~eki)#!3*s6$aHbs&{dj&P?~-j_&`%M>P0a7>r%nK_Wc?(-VW+j;4j~ySd?q1 zsHtT=l|#q>6`Su|&1$*qhws}km#=Yg?l3Jw!-1Y*+{zd4`tWtOfU8UB_N%5lA=PT` ze&+L(uDZIqtvs0)Cfv+)uRKl`OIXZj{~b*Z3cuWTZDYkoDZ-`rWyt$06kmD8^2PZ< z1?G%kv}Aq4>$xB`H^fM=scqTO?uuujYmGgmttM2XZV^{_NZiPwWgC9)&)XuBQpAJ_ zwCb&e$qdV8-^SB&GBUljbHO8fb+j7dTsPJA- z_sVN1difkzyPp6(Di4Jo0jeelyH%za(UQzsz!&HFO~&B1tb-r|lXeaY_ub72$xxU{;M^wd@wGKK1sbCXk3wD8+1iL@tz$4XQC z80yYc;$Us>RPA8BZ6TwT!jBxKCJNm(acEXSKNt#0zx*|_`0`XzAS6}Z$gSanm1A(J zH&}Yf6Z0cq+^#^ddIuif!a~(Pe`}~Vst&9x&Y|jgSs$aD3$~qzkw1rfNA&z8L=#z*j zC#NI2=N=X{RQ<&zBpLke-z-yU?x!xi0#YQ_cldx=O-)UqwA9l0r(a5RV&vrHycQAr9?>^82A494C9=DAokQy_3iTUF;n$64QV4CjgApX71#B@gN^=M+5@HT+F;FlH z)wRB3H1Dt0$Bp&1=kcciesOF{o1oc&l?0t2OJ1$++hQk|5~NOh5AI}@xMQ*9T-;Pw zlyl`BEY@zQAk*I|Y~}Z@<`VJpt1B5vt%(Q120CF{2-zs3!hCdDSj4hdM(xsESs~>e zet}L~UGDZYZfF3?nX!hhz1RDB;G?~+VNhphpQ;zPkx6W_PPIGTKRn!VRHSURA?@>K za=>@(mzxbMXGOa)V-Ro)>&x0%(_K_8@c%G(I#nxhJ(G^;$-6PZhCEWZFuu zi>p2IkG`CiH6}4`@2^YLl_`K%xijrORJ%3Q(bZ3+PWueC_B_`Y1L3L>q34f+xYTEz zE~<84Z2suC3my0AAfo9rM>tqyyLfd-!;*5})?#<%z&F%z$fnQ8ql!vz(fXYUm-Y(j z^0g6DMTx!ffuDDFx{A!NhAvW5K!z!ie!-w{97qQBZf{4DnF_YvFA_lb?P>kxQdP+kz(que9D@ zo$ik4>m!q)PT7Z4QKx}UVU4?CYrFfF&l@@EW$JUe;*AHXKs{hWPwB~Hc9n>NzOomo zbF{e`G!7T`wKJ=>{;E|(r4o0+P~AAn*C^c?z0T6{NJ{R` z)90eT<_rx&qEQkS7keJGU&%O-n6JPfyRDm=L`?m*i|8NWMDJk19+o7%qQZGx5`0H(Aj%a&EYw z#x&UaT~YaLwmq}fG-gJHk4b`lWYW!CE|(?a`V2mbizLNn$%DqJ&pbj?R8FpQolSbB zTL!9Zes_M6wR?T6AtjENJcouSp1*4HkCsc87AK|zcVdq0|AnWv9~iChyP7@NoqZoy z{#s|3NsCpG7pL7?I@ENtlXhp*+PVMf3(ot9M*%81Hur3OE~ZEj6WT>cqovA<`w2MH zXn6$%1*(!#8Lj06Md!vV0N4nCj)l2vp^Xg0kj_@GkSM<^a#RdMf3L1v-B^@65gniq z%3Y;xwlx^EhaD4Sd~Eo&9-wMzbQtaCx?-hdWCN8HlI)j(_l-RcNG~7A&DtQQigWgv z&pkcs6K%5gh=Vh$Gd%`nYt6XC6PQmHoRL>e$?Zj_UXL#eucqjmnwSENAa^$X{GMwoj{Pl7{wR6(I__WSdTPUzHG&t6 z)`F`W8yl6BlBAT+lf$5M_jk6=1JX;V?Jgy@s0AXn9Esq#-Y-zdCJI22890xv zN>u)RmA=sJHX0zj1D>L8avZwFP<~N}F zIlm_YA^_05b=)g5-1(>!>R8;I!QFG4llqad_4Q$E?r*mriFEaiR_EN(4<7!>$tXd4 z31#rQG=-{CCYhKZEZ{m7Rr>rn&ITq6>X*(gif*^gTVeN>SveoCKl;%3T)?-K-<=#R zF`OhW{KZrV(aY0Wwh@sRxUweCEs9hYWZY})u%6t5Annc)I^Ao?i+yRS$*GD&l_7%-Nc0?{rd@-G8KmkKK4!|eQ>pz!O{)>ae@Mu%DGV&>B{xHws z{nE+9QUvJr0El?N1p!v~O7T9#BA91k_VJU61Or9DWdDHmhp+w5w)Ve!?|;0r*_l73 zcJy^z_e28vJCu1(`hWA#|9>-o>b2$J^Z#r)0S;0=1n?aJKIsWe2>AH4Qy$?@b!$v* z$;Ged`b~#xuA}H;@U1(soP0F7{F$!bjL*`Elb2cTUB-VZ5X-%|t=*nnIDgm$MZ_pW zG%41_TyMGS;L%qfDByY=8dqny-K`0r<#%)+W6x9d6Z%RzAtLnF;LmEjF-HDYx8@!( zocyt!X;gDkB^1+G$k#?F?=N3ri*cF~<2-WA9$TIXWjU}Ov#J&&l*%C|f-b#0`^jUp zER{E6Nv-*FbG3)rh293d^x^NWkS&Og+B*-6GR?#!3`g#|u0@osbXN`<1lfU^ZFLv1 z-V}p`?ba~)-0bXgecpXR_d(%Jl1I|xUM97B^Y0*Toc|F8>kaFabLY>rgm%60v%qYI wq;x--^Y0UvQ)0k!zyZ%Nju#O}NPpfH^gZuX*sACf&AWW*qVdBBG+~`!W=7)-;xqEz4LNOUPKBWSCYQ zvF~fhzJ`VvzlZwt_WS2Mf6eEadG7l@*SW6ioO4GSMHxj29qD^_R+aTUwjxw9tRj5n zBJVv;JRaZB(D42II?b(%dAILp-CtnZG_9nfqM|G3gv_zTM6k+V9zVgskq{MS6T%q! z=S^p4=ccBnvuDp{PCqc!J&zYAn^yaUqjN36S3_fdu*wKBKKi}M+S*!OU0vXd@274l z$b2fDua@ezSfZw);+%>xWE0n94|$@|Zw*JpkUUa^hdC$lku4Z~$T5``j4&0|$4CL_ zx}Fnta~y-pIXAfZ?9KWlb$*%{hM&5SkoHON7b>b<&X|vEY(Qe+2MiRV()QPD@H2F; zKCfupKpXXA3fqgG$(;yQhkQG^m0-j~osLgzr=g-EU#5YlFzD;Nyo6X6;oO?j__cT= zCij(x-Lq6xahR;Yg^dd^92l2cxO$^hIs*eN{2GO(R#gRpv5~X|7!p0=V0WJxtaUXw z5QQ;eDGqQL71ekH6yh%|EnrJDYD%@~$BTSCI8AyG0>hl!b1@n0X94u@HS7sAj2z)Xrv-i^aOot(!mwXzawuj@ z=(ct@HDm_9;->Hnr!jy@zCSvbTC+~AS|8_#E+}IS;e(BVLrhd!y~8=^y0;fa}Sc0 z{322T+Y;l6FNso-r&XFs&=X)H5J@TlTgxMr<;3CPVTYFZj&xTcnBw8#G6IiIY%L8H z6&3ZIy@z@Y_j!EU7Dj|)Sx(8@1Zqsmw1h^dpFH=9cgvF?%*zv)edOTux9;tF3o0vW z4=adbp3xBbSgfC^;&frfB4gwo0va%_^xIlCZ256lnAJBwT3u%#GQ4B{Bs=8C(hye9 zJQ%Zg)_zJ1&#}AFtZ)cr@g6H=+qiOLW8>jN>KcR=$U39vxGd&zUH27>eDimAhTgmH zGBIQIK{DyYqWGtly`@>Qq6f^ZgEDh6bPxW1mz1JX%vIm8_d=Kj;8We*=rW|Ir^jM2 z8!Ka}sY?v&>BgmZN6wr%LpEl6!tOoO=H6c@pjK>@(l(KM}^UwK7KP^UwmBzMgyP^?zu^|2vb`0vI01 znvlf-dG6g0>hS@_KO`#i6PVj36hL4+NFhT!T{8FDf=o0H$IZ<>ScD|KdGiJ)Vop=n>%(OI8iS?J?+Iy-KG>%GXblb?tqduDHvjHoaJA*b*lAIj0MR z_-O>N9Ah(VgCN?#Oht}P43ZZuN}Ct^Nf{`lax-R*qu}izU{L9H2QclJ_;RNCdGgpu z={;2Z`-eY|+s<$^U~Fw|i?QXzkfZd*Om;}<#5YNVfhPeqRx^K+L`U4&Tu|HWzJX=o z&6x9D8hp+r6<#pGywF!raI3_{-hQerSxJZVp85s@D!+j+jYP`i+pRr5co-l~qey8#P?EHq{iftIYO`NH19-$@-zD$snK6 z%JRJ;wbI!l?dqQ?tyFn;W$8P(D)28#2sD{2gZeeeLHKWUXjcxc zdV0(nnHsPWxJ|w#l!B%?wegP7rm;N+>%5TjkyLo#wTP}`m__*7XuwJkur+`za%@!u zD9YBgZMLARQk`_9AucYuA-mE{@C>%;QAjmr9d5b1%5MFaYPwxozkFHjE3j_G$t20T z?`+Sc<|0K=+E9P}uu-GAZ>>pS;=r@j>rG65h14VmOa1Yv>g5A z3~p9hWw{|%7a_82A51QmUvlX=pb8V_yF1yK$DjWVM%I>ySzYz;VbBLNxW8EdFte~M zcV~CyTUIVt{}^p-)DgqaRj$+|)h|eoRQjRB_U(Lt_dlpY-9fF-&Kg@oyNef)`dy3* z-Py0LCdg}(E9EmOSD$k;^o>>cEP$jcx*4gmWez&b#SEEJmmU{Tk{=2>vhI#lEKXkn zAHVJu#hNb)Y)5OK&IXwXy2#hb$$j&;7eEW1vz%^}8w=FDX!RjDIrTcbNtz2H5%gb? zVa}#GyX(oJ^UfEmSL-1M#etzOn}QO2@=%=S`a!J+OB7mv*r(4DRHS{E8)pL@^HDk` zr_rkIrWlc#FNrs@jn6LE)=mu3Wj&k>hmpsr#e%b`2~w;n$$l=`qyGP!~1H zYlhiIme_#el){Ya)_kU+Zb)O&_=QaM*{Dvd#9`ewG-!CqSiw zuMcDE9%aV*9HZ|m?tpg$vRb87Nv??+CfW58RMoaNVNjk411b>&qYld#Oo(mQ0{vCg zXlb-sNm}||f1#~J^~TAb^!3Yj^~0VGyd>rCO!{2|DuLuxN!McF=DRzzdC0BB0rovV zNcm<_dF<>RJG+~-;a(%hB&yQH-w}G%oI8ao^g2H21!RMcCxvV)e$=ZM;<5I%ZeFI{ zxS(qN$$G4V*_Nj%F3qe0bTuw1$M%ika__%@2MuFjx@BSoYAloUMFRB;^K6@tLV!SU z+FqZ&!2GXkU6ucLFK_Q2pYBt#N2sXyZLjhd@6>5u1@&kZv}rQ!9HlbXlV{<#*#A!2 zld|hCwo9Ijj8mLi8D!r(-9fe-K4O~>CuD|{I#%hoqBhWu*$RSVL!yK!-&6N7VPSO* z4d>6wxb`C2NA_nZgbTnxPn%7sZGKaf_{SYP44ys zEyuW%pSO4pn46ntJoU$9^V*Q`!+K=+e3OA$+@i!KQKrROEu_%BU%6 z94J70rNbG0s^?YBnmu4TYQl&e8C6m@oI$BvDKcGBD^(H2J{-DB(|oW4(t{vMeYX7e!`qGLlCtDkxw&tZdpVfGPvmNZ((%aM zMTp&K&L~$wZxr^|5M$e%maq!BCb?T*q)34~b9kb<&eIzec0e57@`KgRV6ii-6({eR zaiy5zv(VcigGX=950#>jn%Od8|3@)WqSS$NA!80j=H|erF6a7dy0Ge=Tr=;d?Pb7o z$DVx4p+msYtDoqdhqJ{WKY9c=wRHg zuhddPOH6NS+6z(!$w>Hi;U*$m1==}@e@1N0spA7y)C19L-Ze>6b<{#@L1byD6nQzWBmd@4ISl&{-k$IN z_>m`J2zM|JkZktT!t_Mr9+H6$b$SEf3vV?(LM`B~=5y*80nnoOU(XEz$51MvW;tku z=HV2n=LCnVBB&#jYE}IXtP>r-CJfFFTw^I!!IR(O1xv^LvtDiK6KSVGJx4iSr_IT- z?8RUUy_xCYkHI2aL`@N|;)8A_L`CPm+7)~qm>uq6$CRS_ZGVx5*5?{IFneUQI)In* zG7qRd-1@H}&@Vh_8G1O7PU>?qVDdy3(+joNR><4drNZ9`M+H?rG^v`mn=Wh5N9};M^__ zZcxV$MdKL2S?mFyCjS(88xVUQ_UEP`L>(dwz_t>={-ojWivsm>$@D)f{k{MYfTCah zuXXQ;Qnz5W8ZAPe)V^mZ&QBOlI2?|br zehgc;w)f)7i#IjUUzMur6DLDayh5WcW=`o-g2tN=8@u{X8_cPs*vsW1swV(RC>^AwqPo;rr*4iwX!)gq z(^zWDkzbqTp$q;CCUf^;kJ1H;472Ql{S%j7vSNcM&ph+o_x*go*L8ib>xtHl(v7}+s=t`~8l3=c@3Aj#FKC&c z)%|Q%R#sC})4ISKsj*PLiFcCs{KkgidlC|o#>$JZS)SNPIvLRgnhO^aqNDEzJPr8g zP7DUq+}zB~&HZ}nFGDSXES??1YA;{kTvKrCMC>-5B-hj6-$HIY`Cf@>;Nf&IxdZgyeuZ_5(dV6kAk+qlPKA|JQBEOJpe@ zmsRwAb-&_@I!nT(X#$mDJhYzix@S+PXC-!$l9233lOogLD2>0b8n5wQ+?`c9S^P6j zE5*e!94{}7km3~F5JV(_=Q<8n{w$sjha=Rqj!3zb6k)jgJQgfp)M zgda*f4Zk=tPFD$%2rJCz9KN_)8T*of8={5b6c9<#SH+A^2T^h`W`nqI5jp|B)q0m+iP@c^I+WWPd?)opZq?B*5kShX9pJW%dJR)xMJE%nH{} zHj5kIJu1n#i*=+LZ`5dKeTofZ5Yjv5eazG*_BT8Tl)g{OdGw1kMjUb;twuH>l+$k;H^=hY2hY6(#poQHd|%uBVtnIZ{EB~ z_n|#izNrH$GA6kE{F101#WrR01eQ$Akkgi?=(oKzVq)RswDiWhb*5AD8JzXk;f!hm zT=usX2L}h|Xx~-ePJeejst9h8u1bE6ZI z_EF^#RH|>M6>|;kq4f8iV)<3dA%6-SmSF1Z>#L%2%AEfa0Bp7zs)ual_1kSBqr5xC zj^CvGgM%9Yut_Fcq^VuY<(SBOzAxk!*60~@af83}mD_Z%4V|5s@V|)&fzGr0@6Bcf z1_r7kk$csRjTTxV$8FTvQ_GTq-n=Nt&7$yy^fP5$U3m{spZvdZ^z7uFu_ zu}coWwe5P@7{T202M#~(NT(p@KBHUdIwj{ZSG7`4xxc+UZ7*|aL6CEoJF@HFYH1B3 zI;U!R=>VwFJ(RdcSqDI7<@PG&&)wfaZzs1QbP%zHq*{U65j&en8YmPM71iQkiH)9K zcPN6_%zxLqCRig&I~8E0Az>~yJYE}rt?lS34;NP;-ew>Zl`LuBugmHmjCb{%%$lmF z`LhoLI&z~)Y1`telLEg*5j;0Gz{L@}m4DCLbHS#oT%66iek07ta8W7CR7w=eopE_U zGu7C>ymarKwAQ`4!;m63RmW8}}0=`D9Q_XxE)V{y2* ziT9l&sD_;Da)0l+*ci^(Ft8H5IX_^OZ!9S$<~rS;8g~}MwZAdjVB|`qAnj5HdXMf)9I7xM$?+j5!`+)+~oYwd5dYevpCmUr(Xk1$S7 zPWyoZ15E{HSf9YgPK)W*Mvsm(ru#A{XMkd=sAXfS*JvfCC-Y4i3$6td#)#vNjEp;vda<7(ri)=7tQU;9z1xk zH9t`Jpe+fNEOmIW-qBYQ=XLo>RVLE8)P4PDTTxLFI9mjpViM2H6?4@;KowkZ)<|h3 zBSFF53@fCZeDB0<*$Gsf7l#S7asc(sOOKj)9UQIJCLCZhS6o-AD4u?cbsegz-k!N@ z?_kH4O#et?TjK!@$~}o~+p>i_2jL~Agf&j_ESm#Ri6E`tmBJDt6sYx($yY6q-rg1O za6F)c$9n^{WaQ*tbG?{>0@LkLKW8he%g=i@M!d#Q6CO!RBk!f39~a9(-~9fnlLB0K zwqui<~6bTq_Q)0s0H(+T?I?wzl$SX}p=YC2=nI;pWlDc$yn37asGGko@%!jHqg!rFZiM zfRS%7QqL?Wf=`_xlW-nAm~4)9`}u`{CeV7>8|BF6HP1xEzkK=9)}S=+la%JSVoP#! zRcM_!Cx(wmVwhSMwekloqUVduIlaumk2pw}8 z_O;b?2x%7mR6D}*UM}dT|M9vA-5>JW5!H9l2l$c1p}rjU`gTcL7`|v+%aMhw9xxFU z<441JCA6mPOPh`~x@^zoQC21K{62)zd zuiIxTS9q`fxyfWpFf#MG;nVU)U|&W6)hRFnR4trQ+}3w#xbok^TLHmX7@At~f)SVu zekPQk)Er%;dAI@nnNRe~wo9R905b$=RJt1~iBk=b|<~{K1t0_*hu8m$N4E zIc;OEKVRN+;ZBkabfiG@@Oj)2&0XDKl{4DEp~$ zc2A(MiHtU}t3muj>S|@?{Hi(xT~qa)88J6=2RmqV>IZXF$2IE8oh-#Bk*OnNDd+qYeCY7$QeS;v0 z%;oOal%~?Q1nE(4)e%zZwtReBUt_E1;!xN8-j6Vmuli1hacsFph1#;w_005o1tm}V z^ZK%Hb1ll_mTUG4KD}j(^T+&od~_($c9<5DbOQC)Im$Dj+<^*Aus(J~nTC#gP5=eFhKZ%xb8m@4gZXbh=tKU5EK+Itl_xjxEiOt#{JJxP?YktPf z(6xtuv<2NAa;5O+QjfF>vmMCW?A6z~O=5Ty9DVMF?|7+k*b$jMu;Cisp_Xw`;d76Y z`2@Ci)YaA<%`dCol@k(byQIiiHjY98>#d7=-wvFD?^Mfk;LnDGkWnX->kB2$ko|Zt zw4y?W=@`heoVfV<_qsq()PZv6F$PG;xKrb?8Pinh7GhZ%Z_dJJugT^S*tw&*k6=on>&M2qsCsg?zK>q$U)h1Npy<8AAs{VF9iQXxiKK-o9+e>M z;wh+Mn0>;;9c6B4ts~5sN`e@DK)UE;{hxG4yVgbPGR(MJsroxsT3n`X-`SenWR@;x zsXS~KpDG2pjPJa!CdhMOlrFyEA#(IGwPw}s&t&=)ukpjbPIAvAJL8m=B#zl~Wmxps zhLm;EzSoiK82b(j^9a&s7JaB_-uECK(rw+Orj?lk|747OkdTAxhT4y0wk#@rY|W-veS^ zqI0HT&Ib|w_!DBDWLL<-s+5$%OU-}jzk(Qk5N)AvJRBhSFG!VRGO-hfgJ*CcF<5C7kF{?{@lXK^6m z`uO-@3Dcb|LAA&8`JQzl-t!!*hVPL|3*kOi{OrZp85L$75hwsMFtm4Ya6lqYv#Wo| z%~sDg-zn&(VP`itG5KO6(~5;+R{E+kPkzrw~Jb5zNBEPqZ ziRX@wPf0P+)2ru|)p^m^-9muZ7%ZozjoMuRFJ@#eoUyoln`Q(T%SR_Fr?>SaB4R4x zlt_Bb3$}Fs@%NhKtPQiXv%q2=JXHt)Z-_3W@r=s-dr%~R0QjtU#MUBI8TQNrge-R~ T?8J!XhUDfA?dt`|`;Y$vz|bcW diff --git a/docs/screenshots/issue-125/voucher-toolbar-windows-narrow-sv.png b/docs/screenshots/issue-125/voucher-toolbar-windows-narrow-sv.png index 2609ba0d95ca73375757997d43529f199c6e674d..f18b4229ef625c949f36aa7fdc1b0ee331eb4f75 100644 GIT binary patch delta 4440 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 A*Z=?k delta 4397 zcmZu!c|4R+_orbZV^7Auj-~8Un2;?~){>=cGhrl?eN8+ucCrguOC{MR``*aDBxK*S zWKGDL?R`}5^83B-^WS|w_nv#s_k8a;-%}%4AsEe13dA66Pwjk zCj1Uo+)q@^ot&J!yec!+WrcWeg!;G3l%2+)Wm$0c_Rq4q{OWmlH2AVRJi}3+;!umR zD|=;*&hJ*pCd>$;L%e_&AA~futk~P^a%Q~HTT@GKI;i2zn>@j(LGj%9u4#WVmwcxe zA+N|-T+jVv2n-Co%eJ=ZFB*GUsv>#gX7sw0Rl;{7wAmBJ9EQ3Pt!yJHUJtJ5i`w1M z5X&n;RO^QZVAXx6Q#dsSF`eEjU}tb+G;tCtqnlm9aF=YA{(s8mWsDKVFWq0VZ}Dye`Ji zeYnwea5ULolB?#(W5>};Ob3p&lhx`6yAVd{x$=OlACp?>_L*&1!3@UxE-2K(-_@kEF<|1*#(}AaVkw=gQp9`Zq@Seb2d)=#fWBeSnzvb=Mkq8;teu9eJiWhdFTqUIUzo zd>u&vxgaczp>;_fF1Dd%m!%tQbPhfPrjTNi*!$(ndQg1gkgcSf;^C&gL6{gwg^L18 zN?Z;N2g>bNUltW@yl>&e8#OgIccsedhi37oTz25R;z>Af1g&l_Fstq+rsH?A>``#G zp}rjbZ0!^Q4TCAY-J|^8Q1rKwzeZ$AUtgbc1k)FjGUt1s4N&5IrN_B_s+`8=7{ zDhU3h(A;eO4<2`dl}$7W)Hx3#r(@_YhHEjY#(O6!WGFAxgJx zZEc;MrEs{>vWL7!E5)CuU61DyEmjl8*-m0767#Bzu4?$hmcCB;QSu`Yn2%{nfca{7 zaETBCwGD+)iy#mPMMdA))|i}}9A^uMA>wQ_4@Qd#gen%r`7Nr%k45B>+=mhm`%aIB z^7z0!HxvYrzBZ;4pQTI(tT!=RT3Wg|JI9Bl`{h)_diw(2hZ*Tz%FfIr`Hs+h*2?lL z+Mo88N|ww?IVh!2(<}KrPr`jtWm|iutPQoaI;ZOK8IP87sF=lsoHEX=-`Ws; z&GW(rZB$@dUukvs?nsT-&u*fooN8bcbtmt~2HXVjKmh+ph%<G^wI80AxBzx z-NAasxdT3bXWYTjX3Vbv;_;zR!%nt3VY;tLGZFdKeLuHL*Z4MfZ&~7T>E5l=!*+z| z(o2?T;0&(@9?k}j{0KUrg+l3RG)Hk2s&V@6ex+m-c)Pu2ZpzW|<8w!c_gejFr{Q3} zW)EP}M=*Ok^V8X?D5WD=vD5t!F=GO{HJYb<+&#rJG?m%h6Vv=s!PVUl#rwXb_LGI8hdgI^1t_7PgNrIONM={#Pw{L}JmhdA#fBM62zUX3>R7752wwI_fXkZ+-T)1 zpY%oIU|$T{0{l$!&8iJ!^r6C{q9B_UCj=)FdSClW^Mh>-JxDw?*d*FGG&D45?yc>$ zxcr_gl~+4M(WfzlzHTbCxt}TZ62T_j3p(%fQo(+#;!ZI(w5%{VHwTB7SMTGCh-;*n z08~{BhiPcw#>A@N7_gs_WYcJo6mto(wrg5M9X7VK%!KU@y|=ufmXc*}$Hwr=Pv-LF z8B<*?DpK=lapC!`DNBg7Haw0$lTR61x>+AATXiw2X9nTF#9oV#tc52pB6X%FX=zi{ z_<8b?MY|vDx{q@9jAY0962`Z;vwe;M35gzVZ|ZYJ17h$bCC^+sX2#27j`)zN-qQn8 z*6nBKuxavl#tq?8Rw1&R7Z&pGrRM1A>8&*~>W+ENJY~CVe^ySm;hO4LMx!cI&-4cU_-y7u(BjNP-{ z&*PImJ7%87cke#ewL~QuOG-*sEYRrHz5c`;4Rzlc_fYz^khMf1whxk;(@pIuSfkjP z4%D$};!+o&L1eFN2Lm?OZ4YsyAEm$C*u9CvS}y1FMN|GDg3YaWUI2|J12} zedJ@|!)%QnF~C{doL_#POG7v-$4Ij4_LCUmHUk3#4d)dhXKYt$C>n>$BV3G*k0%?|Q*wOq2LpE< zovtKFOUI`bu8X%UKKrQGekS(OD{Wy>t>;I19z%-hAiwn(Ii)2EV!6qkT^*MX;{b|^ zf7eUs6y259HSf|#Q>nM)A84GjG;&N8|8T$%cEPA19*I*0Uk(mk@bS0Csn$~i`-ptF z7o{{5yJlJE8OqIyy87JR?0av&;7QZ#vI$uiXS0<9^XyMf)%=vr$lP3PN1Y}k92#WT z*x0CMD*kP5uFa>6Cl~lFH2`Sa%m1h8OD#vCkmUj5%L?ohAX75^=;W<)_C{HQw(hKM4{Iv#&iGVp(7 zvP*(WGw+5)cfvmf@7W?hNzOlo8Xomkh5kCF)Pl%2#1IiKeo{<8(c9wqKO}IoWyQZR zx+KvY4t7fj1`R5bY3A4hdbsI9SD@M}R~85Q9Kee~*eq6I@|=!Nf&#Ic>hB<-cl&l< zc3o7{5b0|*(~H@6Me&rly^o?i^2eU;cBZ7#J7`;-D17GYyi!!U51y?zMkgs_gEqLJWSm zT(~ArV&eC({#+Xy3x#QoCw=gh)Uu9ciT|9DA~5hE%r8Y88rC2YA;<&E%g@g*C@9Fw z)2gFzJq0@1W`c;RQfCx43&OygX#)KE2L=p{jLOSBjy0wt@fb;2ek-c}Rv#4SpB-^G zY1tTu{3Hk;?T+!qfqjF+=e2-vX~0 z(JxOj_X-`slCF0m|6;`k&Pz*6o1Jz| z-jo1Y{BF3`yIh3D>eF+Xt*tHROX{fKht6YIhq(M(Zyr_z7(jC0z4He!ppv|{NfPHD z&WFFYE*R#?dT-~Y_Ne~F0~mne_P4()W)x;+sjeqeTiQ@q^SLOGJ@KlZr&gA{o1Zi!w4f zE`0&y~+(R5fX;)vFLVH_VxAkok`%s z*m!>+cNIGj!bi7BSXx>Fp96{ozVhHiYJ2s+Ghkt12?2J$2J?(xK&$wJ6n`Hk16c-c zDO__vqa&5B6}}ON!zYec$EyQhoSNAWCT0ASJQ21e;_kVZ?EUB#;usK-ejqFy=bh9MS+sLcbj`CvW+78j(_N$k$T-;R`|wLbV64m2?N2_AlM*sT~Qid)P2t0_^xJX+0xI|iN0SQ7;Q4tt@NBRsqoSmWQ!5Ulpr%#`p z`{X2K_c-QJi@y^Qr@+WfS3syIfLok3W?fl8b|B*(G71W=T!q6MK#(?lz?ugB)!jI@ XJuZu_(0fr#0)E%kb<_$}(Ek4bFoisX From a468e063a1fa739233488885d535b458c632de8d Mon Sep 17 00:00:00 2001 From: Per Nyfelt Date: Fri, 13 Nov 2026 18:56:55 +0100 Subject: [PATCH 5/5] Byt namn till AdvanceToggleButton --- .../main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy index 021db591..bff7344d 100644 --- a/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy +++ b/app/src/main/groovy/se/alipsa/accounting/ui/VoucherToolbar.groovy @@ -40,7 +40,7 @@ final class VoucherToolbar { } static JToggleButton advanceToggle() { - JToggleButton button = new CommandToggleButton() + JToggleButton button = new AdvanceToggleButton() configure(button, 'new-after-save', 'voucherPanel.toggle.advanceAfterSave') button.margin = new Insets(0, 8, 0, 8) button.addItemListener { updateAdvanceToggleLabel(button) } @@ -93,7 +93,7 @@ final class VoucherToolbar { } /** Keep labelled mode controls aligned with commands without fixing their text width. */ - private static final class CommandToggleButton extends JToggleButton { + private static final class AdvanceToggleButton extends JToggleButton { @Override Dimension getPreferredSize() {