From 2f8d16491e3dccabdeb6042c77cf0adc110f6cd8 Mon Sep 17 00:00:00 2001 From: RememBerBer Date: Fri, 19 Nov 2021 09:24:52 +0800 Subject: [PATCH] top menu adjust --- .../moo/info/ui/component/TopMenuBar.java | 41 +++++++++++-------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java index eba7a4f..c20d3af 100644 --- a/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java +++ b/src/main/java/com/luoboduner/moo/info/ui/component/TopMenuBar.java @@ -1,5 +1,6 @@ package com.luoboduner.moo.info.ui.component; +import cn.hutool.core.thread.ThreadUtil; import com.formdev.flatlaf.FlatLaf; import com.formdev.flatlaf.extras.FlatAnimatedLafChange; import com.luoboduner.moo.info.App; @@ -9,6 +10,7 @@ import com.luoboduner.moo.info.ui.dialog.SettingDialog; import com.luoboduner.moo.info.ui.dialog.SystemEnvResultDialog; import com.luoboduner.moo.info.ui.form.MainWindow; import com.luoboduner.moo.info.util.SystemUtil; +import com.luoboduner.moo.info.util.UpgradeUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -98,6 +100,19 @@ public class TopMenuBar extends JMenuBar { settingMenuItem.setText("Settings"); settingMenuItem.addActionListener(e -> settingActionPerformed()); appMenu.add(settingMenuItem); + + // Show logs + JMenuItem logMenuItem = new JMenuItem(); + logMenuItem.setText("Show logs"); + logMenuItem.addActionListener(e -> logActionPerformed()); + appMenu.add(logMenuItem); + + // System environment variables + JMenuItem sysEnvMenuItem = new JMenuItem(); + sysEnvMenuItem.setText("System environment variables"); + sysEnvMenuItem.addActionListener(e -> sysEnvActionPerformed()); + appMenu.add(sysEnvMenuItem); + // Exit JMenuItem exitMenuItem = new JMenuItem(); exitMenuItem.setText("Exit"); @@ -154,27 +169,17 @@ public class TopMenuBar extends JMenuBar { appearanceMenu.add(fontSizeMenu); topMenuBar.add(appearanceMenu); - // ---------Debug - JMenu debugMenu = new JMenu(); - debugMenu.setText("Debug"); - // Show logs - JMenuItem logMenuItem = new JMenuItem(); - logMenuItem.setText("Show logs"); - logMenuItem.addActionListener(e -> logActionPerformed()); - debugMenu.add(logMenuItem); - // System environment variables - JMenuItem sysEnvMenuItem = new JMenuItem(); - sysEnvMenuItem.setText("System environment variables"); - sysEnvMenuItem.addActionListener(e -> sysEnvActionPerformed()); - - debugMenu.add(sysEnvMenuItem); - - topMenuBar.add(debugMenu); // ---------About JMenu aboutMenu = new JMenu(); aboutMenu.setText("About"); + // Check for Updates + JMenuItem checkForUpdatesItem = new JMenuItem(); + checkForUpdatesItem.setText("Check for Updates"); + checkForUpdatesItem.addActionListener(e -> checkForUpdatesActionPerformed()); + aboutMenu.add(checkForUpdatesItem); + // About JMenuItem aboutMenuItem = new JMenuItem(); aboutMenuItem.setText("About"); @@ -184,6 +189,10 @@ public class TopMenuBar extends JMenuBar { topMenuBar.add(aboutMenu); } + private void checkForUpdatesActionPerformed() { + ThreadUtil.execute(() -> UpgradeUtil.checkUpdate(false)); + } + public void initFontSizeMenu() { if (initialFontSizeItemCount < 0)