From 267630ca478cefdd4f353b07f5e14987efaa8129 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 14 Aug 2024 20:06:00 +0800 Subject: [PATCH] =?UTF-8?q?INO-21074=20=E7=89=88=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=BF=83rtl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/gui/itableeditorpane/UITableModelAdapter.java | 2 ++ .../mainframe/vcs/ui/AbstractSupportSelectTablePane.java | 7 ++++--- .../design/mainframe/vcs/ui/ToolTipTableCellRenderer.java | 2 ++ .../java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java | 4 +--- .../com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java | 2 ++ 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index 8b046f3d08..93e27700f5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -1,6 +1,7 @@ package com.fr.design.gui.itableeditorpane; import com.fr.base.BaseUtils; +import com.fr.base.i18n.BidiUtils; import com.fr.design.dialog.FineJOptionPane; import com.fr.design.mainframe.DesignerContext; import com.fr.log.FineLoggerFactory; @@ -41,6 +42,7 @@ public abstract class UITableModelAdapter extends AbstractTableModel implemen protected UITableModelAdapter(String[] columnNames) { this.columnNames = columnNames; table = new JTable(this); + BidiUtils.applyOrientationByLocale(table); table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); // TableRowSorter rowSorter = new TableRowSorter(this); // table.setRowSorter(rowSorter); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java index 75733121de..3e71162c7e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/AbstractSupportSelectTablePane.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.vcs.ui; +import com.fr.base.i18n.BidiUtils; import com.fr.base.svg.IconUtils; import com.fr.design.data.tabledata.tabledatapane.loading.TipsPane; import com.fr.design.dialog.BasicPane; @@ -307,8 +308,8 @@ public abstract class AbstractSupportSelectTablePane exte UILabel label = new UILabel(valueStr); if (needIcon4Head(column)) { label.setIcon(IconUtils.readIcon("/com/fr/design/standard/vcslist/vcs_sort")); - label.setHorizontalTextPosition(JLabel.LEFT); - label.setHorizontalAlignment(SwingConstants.LEFT); + label.setHorizontalTextPosition(JLabel.LEADING); + label.setHorizontalAlignment(SwingConstants.LEADING); } selectBox.setHorizontalAlignment(SwingConstants.CENTER); selectBox.setBorderPainted(true); @@ -317,7 +318,7 @@ public abstract class AbstractSupportSelectTablePane exte component.setBackground(tableHeader.getBackground()); component.setFont(tableHeader.getFont()); component.setBorder(UIManager.getBorder("TableHeader.cellBorder")); - return component; + return BidiUtils.applyOrientationByLocale(component); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java index bfb10e2057..c91b918d02 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/ToolTipTableCellRenderer.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.vcs.ui; +import com.fr.base.i18n.BidiUtils; import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; @@ -25,6 +26,7 @@ public class ToolTipTableCellRenderer extends DefaultTableCellRenderer { String toolTipText = GeneralUtils.objectToString(value); if (StringUtils.isNotEmpty(toolTipText)) { ((JLabel) component).setToolTipText(toolTipText); + BidiUtils.setOrientationByLocale(component); } } return component; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java index 11da401226..126c078c33 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsNewPane.java @@ -17,8 +17,6 @@ import com.fr.design.mainframe.vcs.common.VcsCacheFileNodeFile; import com.fr.design.mainframe.vcs.common.VcsHelper; import com.fr.file.FileNodeFILE; import com.fr.file.filetree.FileNode; -import com.fr.file.filetree.FileNodes; -import com.fr.io.utils.ResourceIOUtils; import com.fr.report.InconsistentLockException; import com.fr.report.entity.VcsEntity; import com.fr.stable.StableUtils; @@ -36,7 +34,7 @@ import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.SwingWorker; import javax.swing.UIManager; -import java.awt.*; +import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java index ce4db1e0d7..c83a9f3299 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/ui/VcsOperatorPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe.vcs.ui; +import com.fr.base.i18n.BidiUtils; import com.fr.design.layout.FRGUIPaneFactory; import javax.swing.JComponent; @@ -35,6 +36,7 @@ public class VcsOperatorPane extends JPanel { value.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.add(value); } + BidiUtils.applyOrientationByLocale(this); } }