Backup

Ultreon · Sep 27, 2023 · c70214c · c70214c
1 parent a6e5463
commit c70214c
Show file tree

Hide file tree

Showing 7 changed files with 308 additions and 18 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -31,12 +31,11 @@ configurations {
 
 dependencies {
 //    implementation("com.github.weisj:darklaf-core:3.0.0")
-    implementation("com.formdev:flatlaf:2.4")
-    implementation("com.formdev:flatlaf-intellij-themes:2.4")
-    implementation("com.formdev:flatlaf-extras:2.4")
-    implementation("com.formdev:flatlaf-swingx:2.4")
+    implementation("com.formdev:flatlaf:3.0")
+    implementation("com.formdev:flatlaf-intellij-themes:3.0")
+    implementation("com.formdev:flatlaf-extras:3.0")
+    implementation("com.formdev:flatlaf-swingx:3.0")
     implementation("commons-lang:commons-lang:2.6")
-//    implementation("com.formdev:flatlaf-jide-oss:2.4")
     implementation("org.drjekyll:fontchooser:2.4")
     implementation("com.google.code.gson:gson:2.9.0")
     implementation("com.miglayout:miglayout-swing:11.0")

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/intellijthemes/IJThemesPanel.kt b/src/main/kotlin/com/ultreon/notepadimproved/intellijthemes/IJThemesPanel.kt
@@ -25,6 +25,8 @@ import com.formdev.flatlaf.*
 import com.formdev.flatlaf.IntelliJTheme.ThemeLaf
 import com.formdev.flatlaf.extras.FlatAnimatedLafChange
 import com.formdev.flatlaf.extras.FlatSVGIcon
+import com.formdev.flatlaf.themes.FlatMacDarkLaf
+import com.formdev.flatlaf.themes.FlatMacLightLaf
 import com.formdev.flatlaf.util.LoggingFacade
 import com.formdev.flatlaf.util.StringUtils
 import com.ultreon.notepadimproved.main.AppPrefs
@@ -159,6 +161,34 @@ class IJThemesPanel : JPanel() {
             )
         )
 
+        if (showLight) themes.add(
+            IJThemeInfo(
+                "FlatLaf macOS Light",
+                null,
+                true,
+                null,
+                null,
+                null,
+                null,
+                null,
+                FlatMacLightLaf::class.java.name
+            )
+        )
+
+        if (showDark) themes.add(
+            IJThemeInfo(
+                "FlatLaf macOS Dark",
+                null,
+                true,
+                null,
+                null,
+                null,
+                null,
+                null,
+                FlatMacDarkLaf::class.java.name
+            )
+        )
+
         // add themes from directory
         categories[themes.size] = "Current Directory"
         themes.addAll(themesManager.moreThemes)

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/main.kt b/src/main/kotlin/com/ultreon/notepadimproved/main.kt
@@ -16,6 +16,7 @@ fun main() {
     Thread.setDefaultUncaughtExceptionHandler { _, ex ->
         crash(ex)
     }
+
     LanguageManager.registerDefaults()
     LanguageManager.freeze()
 

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/main/AppPrefs.kt b/src/main/kotlin/com/ultreon/notepadimproved/main/AppPrefs.kt
@@ -94,21 +94,27 @@ object AppPrefs {
                 val lafClassName = state[KEY_LAF, FlatLightLaf::class.java.name]
                 if (IntelliJTheme.ThemeLaf::class.java.name == lafClassName) {
                     val theme = state[KEY_LAF_THEME, ""]
-                    if (theme.startsWith(RESOURCE_PREFIX)) IntelliJTheme.setup(
-                        IJThemesPanel::class.java.getResourceAsStream(
-                            IJThemesPanel.THEMES_PACKAGE + theme.substring(
-                                RESOURCE_PREFIX.length
+                    if (theme.startsWith(RESOURCE_PREFIX)) {
+                        IntelliJTheme.setup(
+                            IJThemesPanel::class.java.getResourceAsStream(
+                                IJThemesPanel.THEMES_PACKAGE + theme.substring(
+                                    RESOURCE_PREFIX.length
+                                )
                             )
                         )
-                    ) else if (theme.startsWith(FILE_PREFIX)) FlatLaf.setup(
-                        IntelliJTheme.createLaf(
-                            FileInputStream(
-                                theme.substring(
-                                    FILE_PREFIX.length
+                    } else if (theme.startsWith(FILE_PREFIX)) {
+                        FlatLaf.setup(
+                            IntelliJTheme.createLaf(
+                                FileInputStream(
+                                    theme.substring(
+                                        FILE_PREFIX.length
+                                    )
                                 )
                             )
                         )
-                    ) else FlatLightLaf.setup()
+                    } else {
+                        FlatLightLaf.setup()
+                    }
                     if (theme.isNotEmpty()) UIManager.getLookAndFeelDefaults()[THEME_UI_KEY] = theme
                 } else if (FlatPropertiesLaf::class.java.name == lafClassName) {
                     val theme = state[KEY_LAF_THEME, ""]

diff --git a/src/main/kotlin/com/ultreon/notepadimproved/main/Editor.kt b/src/main/kotlin/com/ultreon/notepadimproved/main/Editor.kt
@@ -288,6 +288,12 @@ internal class Editor(file: File?, private val mainFrame: MainFrame) : JInternal
         recentFilesMenu.removeAll()
         recentFiles.forEach { recentFilesMenu.add(JMenuItem(action(it.name) { openFile(it) })) }
         Settings.recentFiles = recentFiles.toList()
+
+        this.`hello world this is with spaces`()
+    }
+
+    fun `hello world this is with spaces`() {
+
     }
 
     private fun configureFont() {