feat: 新增jre/vm信息显示, 置顶APP

Leon406 · Sep 5, 2021 · 0fc4ff0 · 0fc4ff0
1 parent 4b4b6f9
commit 0fc4ff0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/src/main/kotlin/me/leon/ext/Prefs.kt b/src/main/kotlin/me/leon/ext/Prefs.kt
@@ -4,10 +4,16 @@ import java.util.prefs.Preferences
 
 object Prefs {
     private const val IGNORE_UPDATE = "isIgnoreUpdate"
+    private const val ALWAYS_ON_TOP = "alwaysOnTop"
     private val preference = Preferences.userNodeForPackage(Prefs::class.java)
     var isIgnoreUpdate
         get() = preference.getBoolean(IGNORE_UPDATE, false)
         set(value) {
             preference.putBoolean(IGNORE_UPDATE, value)
         }
+    var alwaysOnTop
+        get() = preference.getBoolean(ALWAYS_ON_TOP, true)
+        set(value) {
+            preference.putBoolean(ALWAYS_ON_TOP, value)
+        }
 }
diff --git a/src/main/kotlin/me/leon/view/AboutView.kt b/src/main/kotlin/me/leon/view/AboutView.kt
@@ -19,8 +19,10 @@ class AboutView : View("关于") {
         spacing = DEFAULT_SPACING
         paddingAll = DEFAULT_SPACING
         imageview(Image("/tb.png"))
-        text("版本 v$VERSION") { font = Font.font(18.0) }
-        text("构建时间 ${times()}")
+        text("版本: v$VERSION") { font = Font.font(18.0) }
+        text("BUILD: ${times()}")
+        text("JRE: ${System.getProperty("java.runtime.version")}")
+        text("VM: ${System.getProperty("java.vm.name")}")
         hyperlink("吾爱破解地址") { action { PJ52_URL.openInBrowser() } }
         hyperlink("github开源地址") {
             font = Font.font(18.0)
@@ -36,11 +38,11 @@ class AboutView : View("关于") {
     private fun checkUpdate(isAuto: Boolean = true) {
         if (!isAuto) return
         runAsync { CHECK_UPDATE_URL.readFromNet(CHECK_UPDATE_URL2) } ui
-            {
-                latestVersion.text =
-                    if (it.isEmpty()) "未知错误"
-                    else if (VERSION != it) "发现新版本 v$it".also { find<UpdateFragment>().openModal() }
-                    else "已是最新版本"
-            }
+                {
+                    latestVersion.text =
+                        if (it.isEmpty()) "未知错误"
+                        else if (VERSION != it) "发现新版本 v$it".also { find<UpdateFragment>().openModal() }
+                        else "已是最新版本"
+                }
     }
 }
diff --git a/src/main/kotlin/me/leon/view/Home.kt b/src/main/kotlin/me/leon/view/Home.kt
@@ -1,5 +1,6 @@
 package me.leon.view
 
+import javafx.stage.StageStyle
 import java.security.Security
 import me.leon.APP_NAME
 import me.leon.VERSION
@@ -19,6 +20,7 @@ class Home : View("$APP_NAME v.$VERSION") {
         tab<SignatureView>()
         tab<QrcodeView>()
         tab<AboutView>()
+        primaryStage.isAlwaysOnTop = true
     }
 
     companion object {

diff --git a/src/main/kotlin/me/leon/view/QrcodeView.kt b/src/main/kotlin/me/leon/view/QrcodeView.kt
@@ -24,20 +24,8 @@ import javafx.scene.layout.HBox
 import javafx.scene.paint.Paint
 import javafx.stage.Stage
 import javafx.stage.StageStyle
+import me.leon.ext.*
 import kotlin.math.abs
-import me.leon.ext.DEFAULT_SPACING_20X
-import me.leon.ext.DEFAULT_SPACING_2X
-import me.leon.ext.DEFAULT_SPACING_3X
-import me.leon.ext.DEFAULT_SPACING_4X
-import me.leon.ext.clipboardImage
-import me.leon.ext.clipboardText
-import me.leon.ext.copy
-import me.leon.ext.createQR
-import me.leon.ext.fileChooser
-import me.leon.ext.qrReader
-import me.leon.ext.showToast
-import me.leon.ext.toBufferImage
-import me.leon.ext.toFxImg
 import tornadofx.*
 
 class QrcodeView : View("Qrcode") {
@@ -90,19 +78,6 @@ class QrcodeView : View("Qrcode") {
                 }
             }
         }
-        hbox {
-            spacing = DEFAULT_SPACING_2X
-            label("生成：")
-            button("生成二维码") {
-                action {
-                    if (tf.text.isNotEmpty()) {
-                        iv.image = createQR(tf.text)
-                    }
-                }
-                shortcut(KeyCombination.valueOf("F9"))
-                tooltip("快捷键F9")
-            }
-        }
 
         hbox {
             spacing = DEFAULT_SPACING_3X
@@ -118,7 +93,22 @@ class QrcodeView : View("Qrcode") {
             textarea {
                 promptText = "请输入文本或者使用截屏识别/识别二维码"
                 isWrapText = true
+                prefHeight = DEFAULT_SPACING_10X
             }
+
+        hbox {
+            spacing = DEFAULT_SPACING_2X
+            label("生成：")
+            button("生成二维码") {
+                action {
+                    if (tf.text.isNotEmpty()) {
+                        iv.image = createQR(tf.text)
+                    }
+                }
+                shortcut(KeyCombination.valueOf("F9"))
+                tooltip("快捷键F9")
+            }
+        }
         hbox {
             label("二维码图片:")
             button(graphic = imageview(Image("/copy.png"))) {