feat(settings): use Splitter instead of ComboBox

Author: Blarc

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClient.kt

@@ -7,20 +7,23 @@ import com.github.blarc.ai.commits.intellij.plugin.notifications.sendNotificatio
 import com.intellij.ide.passwordSafe.PasswordSafe
 import com.intellij.util.xmlb.annotations.Attribute
 import com.intellij.util.xmlb.annotations.Transient
+import javax.swing.Icon
 
 abstract class LLMClient(
     @Attribute var displayName: String,
     @Attribute var host: String,
     @Attribute var proxyUrl: String?,
     @Attribute var timeout: Int,
     @Attribute var modelId: String,
-    @Attribute var temperature: String
+    @Attribute var temperature: String,
 ) : Cloneable {
     @get:Transient
     var token: String
         get() = retrieveToken(displayName) ?: ""
         set(token) = saveToken(token)
 
+    abstract fun getIcon(): Icon
+
     abstract fun getHosts(): Set<String>
 
     abstract fun getModelIds(): Set<String>

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/LLMClientTable.kt

@@ -2,22 +2,21 @@ package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
 import com.github.blarc.ai.commits.intellij.plugin.AICommitsBundle.message
 import com.github.blarc.ai.commits.intellij.plugin.createColumn
-import com.github.blarc.ai.commits.intellij.plugin.settings.AICommitsListCellRenderer
 import com.github.blarc.ai.commits.intellij.plugin.settings.AppSettings2
 import com.intellij.openapi.ui.DialogPanel
 import com.intellij.openapi.ui.DialogWrapper
-import com.intellij.openapi.ui.ValidationInfo
+import com.intellij.openapi.ui.Splitter
+import com.intellij.openapi.ui.popup.ListItemDescriptorAdapter
 import com.intellij.ui.JBCardLayout
-import com.intellij.ui.components.Panel
-import com.intellij.ui.dsl.builder.Align
-import com.intellij.ui.dsl.builder.bindItem
-import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.builder.toNullableProperty
+import com.intellij.ui.components.JBList
+import com.intellij.ui.popup.list.GroupedItemsListRenderer
 import com.intellij.ui.table.TableView
-import com.intellij.util.containers.ContainerUtil
+import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.ListTableModel
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
+import javax.swing.JComponent
+import javax.swing.JPanel
 import javax.swing.ListSelectionModel.SINGLE_SELECTION
 
 class LLMClientTable {
@@ -97,50 +96,32 @@ class LLMClientTable {
     }
 
     private class LLMClientDialog(val newLlmClient: LLMClient? = null) : DialogWrapper(true) {
-        private val cardLayout = JBCardLayout()
-        private val cardPanel = Panel(null, cardLayout)
+
         private val llmClients: List<LLMClient> = getLlmClients(newLlmClient)
-        private var currentLlmClientDisplayName: String = llmClients[0].displayName
         var llmClient = newLlmClient ?: llmClients[0]
 
+        private val cardLayout = JBCardLayout().apply {
+            // Register validators of the currently active cards
+//            (findComponentById(llmClient.displayName) as DialogPanel).registerValidators(myDisposable) {
+//                isOKActionEnabled = ContainerUtil.and(it.values) { info: ValidationInfo -> info.okEnabled }
+//            }
+        }
+
         init {
             title = newLlmClient?.let { "Edit LLM Client" } ?: "Add LLM Client"
             setOKButtonText(newLlmClient?.let { message("actions.update") } ?: message("actions.add"))
-
-            llmClients.forEach {
-                cardPanel.add(it.displayName, it.panel().create())
-            }
-            cardLayout.show(cardPanel, currentLlmClientDisplayName)
-            (cardLayout.findComponentById(currentLlmClientDisplayName) as DialogPanel).registerValidators(myDisposable) {
-                isOKActionEnabled = ContainerUtil.and(it.values) { info: ValidationInfo -> info.okEnabled }
-            }
-
             init()
         }
 
         override fun doOKAction() {
-            (cardLayout.findComponentById(currentLlmClientDisplayName) as DialogPanel).apply()
+            (cardLayout.findComponentById(llmClient.displayName) as DialogPanel).apply()
             super.doOKAction()
         }
 
-        override fun createCenterPanel() = panel {
-            row("Client") {
-                comboBox(llmClients, AICommitsListCellRenderer())
-                    .align(Align.FILL)
-                    .applyToComponent {
-                        addItemListener {
-                            currentLlmClientDisplayName = (it.item as LLMClient).displayName
-                            cardLayout.show(cardPanel, currentLlmClientDisplayName)
-                        }
-                    }
-                    .applyToComponent {
-                        isEnabled = newLlmClient == null
-                    }
-                    .bindItem(::llmClient.toNullableProperty())
-            }
-            row {
-                cell(cardPanel)
-            }
+        override fun createCenterPanel() = if (newLlmClient == null) {
+            createCardSplitter()
+        } else {
+            llmClient.panel().create()
         }
 
         private fun getLlmClients(newLLMClient: LLMClient?): List<LLMClient> {
@@ -154,6 +135,37 @@ class LLMClientTable {
                 listOf(newLLMClient)
             }
         }
+
+        private fun createCardSplitter(): JComponent {
+            return Splitter(false, 0.25f).apply {
+
+                val cardPanel = JPanel(cardLayout).apply {
+                    preferredSize = JBUI.size(640, 480)
+                    llmClients.forEach {
+                        add(it.displayName, it.panel().create())
+                    }
+                }
+
+                val cardsList = JBList(llmClients).apply {
+                    val descriptor = object : ListItemDescriptorAdapter<LLMClient>() {
+                        override fun getTextFor(value: LLMClient) = value.displayName
+                        override fun getIconFor(value: LLMClient) = value.getIcon()
+                    }
+                    cellRenderer = object : GroupedItemsListRenderer<LLMClient>(descriptor) {
+                        override fun createItemComponent() = super.createItemComponent().apply {
+                            border = JBUI.Borders.empty(4, 4, 4, 10)
+                        }
+                    }
+                    addListSelectionListener {
+                        llmClient = selectedValue
+                        cardLayout.show(cardPanel, llmClient.displayName)
+                    }
+                }
+
+                firstComponent = cardsList
+                secondComponent = cardPanel
+            }
+        }
     }
 
 }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/OpenAIClient.kt

@@ -10,7 +10,9 @@ import com.aallam.openai.client.OpenAI
 import com.aallam.openai.client.OpenAIConfig
 import com.aallam.openai.client.OpenAIHost
 import com.aallam.openai.client.ProxyConfig
+import com.github.blarc.ai.commits.intellij.plugin.Icons
 import com.intellij.util.xmlb.annotations.Attribute
+import javax.swing.Icon
 import kotlin.time.Duration.Companion.seconds
 
 class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
@@ -30,6 +32,10 @@ class OpenAIClient(displayName: String = "OpenAI") : LLMClient(
         val modelIds = mutableSetOf("gpt-3.5-turbo", "gpt-4")
     }
 
+    override fun getIcon(): Icon {
+        return Icons.AI_COMMITS
+    }
+
     override fun getHosts(): Set<String> {
         return hosts
     }

src/main/kotlin/com/github/blarc/ai/commits/intellij/plugin/settings/clients/TestAIClient.kt

@@ -1,5 +1,8 @@
 package com.github.blarc.ai.commits.intellij.plugin.settings.clients
 
+import com.github.blarc.ai.commits.intellij.plugin.Icons
+import javax.swing.Icon
+
 data class TestAIClient(var name: String = "TestAI") : LLMClient(
     name,
     "testAiBaseUrl",
@@ -8,6 +11,11 @@ data class TestAIClient(var name: String = "TestAI") : LLMClient(
     "gpt-3.5-turbo",
     "0.7"
 ) {
+
+    override fun getIcon(): Icon {
+        return Icons.AI_COMMITS
+    }
+
     override fun getHosts(): Set<String> {
         return mutableSetOf()
     }