From 4df3948e66163ff99f2f1257d5e0b8357b74df61 Mon Sep 17 00:00:00 2001 From: rememberber Date: Thu, 4 Jul 2019 22:34:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?optimize:=E7=BB=86=E8=8A=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tool/push/ui/form/AboutForm.form | 36 +++++++++++-------- .../tool/push/ui/form/AboutForm.java | 19 +++++----- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.form b/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.form index bf3f559e..cce23ac1 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.form +++ b/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.form @@ -1,9 +1,9 @@
- + - + @@ -27,14 +27,6 @@ - - - - - - - - @@ -47,7 +39,7 @@ - + @@ -56,7 +48,7 @@ - + @@ -65,7 +57,7 @@ - + @@ -74,7 +66,7 @@ - + @@ -90,6 +82,22 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java b/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java index 6e765581..3db1c315 100644 --- a/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java +++ b/src/main/java/com/fangxuele/tool/push/ui/form/AboutForm.java @@ -49,7 +49,7 @@ public static void init() { */ private void $$$setupUI$$$() { aboutPanel = new JPanel(); - aboutPanel.setLayout(new GridLayoutManager(9, 2, new Insets(0, 0, 0, 0), -1, -1)); + aboutPanel.setLayout(new GridLayoutManager(10, 2, new Insets(0, 0, 0, 0), -1, -1)); sloganLabel = new JLabel(); sloganLabel.setIcon(new ImageIcon(getClass().getResource("/icon/logo-md.png"))); sloganLabel.setText(""); @@ -60,9 +60,6 @@ public static void init() { if (label1Font != null) label1.setFont(label1Font); label1.setText("WePush"); aboutPanel.add(label1, new GridConstraints(1, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); - final JLabel label2 = new JLabel(); - label2.setText("Proudly by RememBerBer 周波"); - aboutPanel.add(label2, new GridConstraints(2, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); qrCodeLabel = new JLabel(); qrCodeLabel.setIcon(new ImageIcon(getClass().getResource("/icon/weixin-qrcode.png"))); qrCodeLabel.setText(""); @@ -72,26 +69,32 @@ public static void init() { Font versionLabelFont = this.$$$getFont$$$("Microsoft YaHei UI", -1, -1, versionLabel.getFont()); if (versionLabelFont != null) versionLabel.setFont(versionLabelFont); versionLabel.setText("版本：v_1.00_170607"); - aboutPanel.add(versionLabel, new GridConstraints(6, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + aboutPanel.add(versionLabel, new GridConstraints(7, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); checkUpdateLabel = new JLabel(); Font checkUpdateLabelFont = this.$$$getFont$$$(null, Font.BOLD, -1, checkUpdateLabel.getFont()); if (checkUpdateLabelFont != null) checkUpdateLabel.setFont(checkUpdateLabelFont); checkUpdateLabel.setText("检查更新"); - aboutPanel.add(checkUpdateLabel, new GridConstraints(7, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + aboutPanel.add(checkUpdateLabel, new GridConstraints(8, 0, 1, 1, GridConstraints.ANCHOR_EAST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); companyLabel = new JLabel(); Font companyLabelFont = this.$$$getFont$$$("Microsoft YaHei UI", -1, -1, companyLabel.getFont()); if (companyLabelFont != null) companyLabel.setFont(companyLabelFont); companyLabel.setText("Fork me on Gitee: https://gitee.com/zhoubochina/WePush"); - aboutPanel.add(companyLabel, new GridConstraints(8, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + aboutPanel.add(companyLabel, new GridConstraints(9, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); helpDocLabel = new JLabel(); Font helpDocLabelFont = this.$$$getFont$$$(null, Font.BOLD, -1, helpDocLabel.getFont()); if (helpDocLabelFont != null) helpDocLabel.setFont(helpDocLabelFont); helpDocLabel.setText("| 帮助文档"); - aboutPanel.add(helpDocLabel, new GridConstraints(7, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + aboutPanel.add(helpDocLabel, new GridConstraints(8, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); pushTotalLabel = new JLabel(); pushTotalLabel.setText("已累计为您推送 0 条消息"); pushTotalLabel.setToolTipText(" 自3.4.0版本开始算起"); aboutPanel.add(pushTotalLabel, new GridConstraints(5, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label2 = new JLabel(); + label2.setText("专注批量推送的小而美的工具"); + aboutPanel.add(label2, new GridConstraints(2, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); + final JLabel label3 = new JLabel(); + label3.setText("Proudly by RememBerBer 周波"); + aboutPanel.add(label3, new GridConstraints(6, 0, 1, 2, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false)); } /** From 149f69684f28e3fdd3084aff2adad3185a044b90 Mon Sep 17 00:00:00 2001 From: duoduo Date: Fri, 5 Jul 2019 00:50:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?readme:=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 74710701..c9007a4d 100644 --- a/readme.md +++ b/readme.md @@ -136,7 +136,6 @@ + Swing界面不好控制，导致需要投入较多精力和耐心 + 工作过于饱和，经常到半夜很晚才挤出一点时间 + 要做的事情有很多，比如WePush中间件及其附属的集消息中心、通知报警、任务、批量、重试、统计等于一身的方便部署的Web管理应用 -+ 需要不断调整工作和个人项目状态 + 陪家人时间变少或无 + 锻炼身体时间变少或无 + 越来越发现需要不断学习源码和底层的重要性