From d530ff07edf7ef211b465d3bebc37ceb54ef8a71 Mon Sep 17 00:00:00 2001
From: Administrator <1525436766@qq.com>
Date: 星期六, 13 八月 2022 09:16:47 +0800
Subject: [PATCH] 定制版本汇集器跳死工具
---
src/main/main_window.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/main/main_window.java b/src/main/main_window.java
index f3775ac..d103bb8 100644
--- a/src/main/main_window.java
+++ b/src/main/main_window.java
@@ -20,6 +20,7 @@
import javax.swing.JTextField;
import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
import java.awt.Color;
import java.nio.ByteBuffer;
@@ -63,6 +64,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.jvnet.substance.SubstanceLookAndFeel;
+import org.jvnet.substance.skin.CremeSkin;
public class main_window {
public static final int CommDevType_MON = 0;
@@ -99,7 +102,7 @@
public boolean isDebugMode = false; //是否为调试模式true:调试模式 false:打包模式[会隐藏左侧选项卡]
- public static boolean noPicModel = true; //无图模式
+ public static boolean noPicModel = false; //无图模式
public boolean MonVol_Is_Adj = false;
public boolean MonRes_Is_Test = false;
@@ -253,14 +256,17 @@
if(LANG_TYPE_EN == LANG_TYPE) {
frmSerialport.setTitle(this.mTitle + "_EN");
}
- frmSerialport.setIconImage(Toolkit.getDefaultToolkit().getImage(main_window.class.getResource("/main/12164006.png")));
+ //frmSerialport.setIconImage(Toolkit.getDefaultToolkit().getImage(main_window.class.getResource("/main/12164006.png")));
+ frmSerialport.setIconImage(Toolkit.getDefaultToolkit().getImage(main_window.class.getResource("/main/uis.png")));
frmSerialport.setBounds(100, 100, 1030, 640);
frmSerialport.setMinimumSize(new Dimension(1030, 640) );
frmSerialport.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
frmSerialport.setLocationRelativeTo(null);
Panel panel = new Panel();
- frmSerialport.getContentPane().add(panel, BorderLayout.NORTH);
+ //frmSerialport.getContentPane().add(panel, BorderLayout.NORTH);
+ frmSerialport.getContentPane().add(panel, BorderLayout.SOUTH);
+
String comm_title = "通信地址 / 波特率";
if(LANG_TYPE_EN == LANG_TYPE) {
comm_title = "Comm Addr / Bit Rate";
@@ -268,15 +274,18 @@
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
tab_comm_type = new JTabbedPane(JTabbedPane.TOP);
- panel.add(tab_comm_type);
+ //panel.add(tab_comm_type);
JPanel panel_8 = new JPanel();
- tab_comm_type.addTab("RS485\u901A\u4FE1", null, panel_8, null);
- panel_8.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u4E32\u53E3\u53F7 / \u6CE2\u7279\u7387", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
- panel_8.setLayout(new FlowLayout(FlowLayout.CENTER, 2, 0));
+ panel.add(panel_8);
+ //tab_comm_type.addTab("RS485\u901A\u4FE1", null, panel_8, null);
+ panel_8.setBorder(new TitledBorder(null, "\u4E32\u53E3\u53F7 / \u6CE2\u7279\u7387", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+ //panel_8.setLayout(new FlowLayout(FlowLayout.CENTER, 2, 0));
+ panel_8.setLayout(new GridLayout(1,4));
btn_renew_commport = new JButton("\u5237\u65B0");
panel_8.add(btn_renew_commport);
- btn_renew_commport.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/arrow_refresh.png")));
+ //btn_renew_commport.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/arrow_refresh.png")));
+ btn_renew_commport.setIcon(new ImageIcon(main_window.class.getResource("/oem/arrow_refresh.png")));
btn_renew_commport.setFont(new Font("宋体", Font.PLAIN, 12));
btn_renew_commport.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
@@ -301,8 +310,8 @@
cb_dev_type.setModel(new DefaultComboBoxModel(new String[] {"SAM", "MSP", "MSP_RF", "SWM(\u534E\u82AF\u5A01\u7279)"}));
panel_8.add(cb_dev_type);
- label = new JLabel("");
- panel_8.add(label);
+ //label = new JLabel("");
+ //panel_8.add(label);
panel_3 = new JPanel();
FlowLayout flowLayout = (FlowLayout) panel_3.getLayout();
@@ -332,7 +341,7 @@
if(LANG_TYPE_EN == LANG_TYPE) {
comm_title = "Comm Port";
}
- panel_1.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "\u8BBE\u5907\u5730\u5740", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
+ panel_1.setBorder(new TitledBorder(null, "\u8BBE\u5907\u5730\u5740", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel.add(panel_1);
if(cb_commport.getItemCount() > 0) {
cb_commport.setSelectedIndex(0);
@@ -371,9 +380,9 @@
}
}
});
- tf_target_addr.setDocument(new LimitedDocument(3, "0123456789"));
+ tf_target_addr.setDocument(new LimitedDocument(4, "0123456789"));
tf_target_addr.setText("255");
- tf_target_addr.setColumns(4);
+ tf_target_addr.setColumns(5);
btnNewButton_1 = new JButton("\u4E0B\u4E00\u4E2A");
//panel_1.add(btnNewButton_1);
@@ -402,7 +411,8 @@
}
btn_connet = new JButton(comm_title);
if(!noPicModel) {
- btn_connet.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/connect.png")));
+ //btn_connet.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/connect.png")));
+ btn_connet.setIcon(new ImageIcon(main_window.class.getResource("/oem/connect.png")));
}
btn_connet.setFont(new Font("宋体", Font.PLAIN, 24));
btn_connet.setEnabled(true);
@@ -498,7 +508,8 @@
}
btn_break = new JButton(comm_title);
if(!noPicModel) {
- btn_break.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/disconnect.png")));
+ //btn_break.setIcon(new ImageIcon(main_window.class.getResource("/png_16x16/disconnect.png")));
+ btn_break.setIcon(new ImageIcon(main_window.class.getResource("/oem/disconnect.png")));
}
btn_break.setFont(new Font("宋体", Font.PLAIN, 24));
panel_2.add(btn_break);
@@ -741,6 +752,14 @@
}
}
+ try {
+ SubstanceLookAndFeel.setSkin(new CremeSkin());
+ UIManager.setLookAndFeel("com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException
+ | UnsupportedLookAndFeelException e1) {
+ e1.printStackTrace();
+ }
+
/**************************************************************************/
mMainFormTimer = new Timer(200, new ActionListener() {
@Override
--
Gitblit v1.9.1