Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reworked settings #27

Merged
merged 4 commits into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.github.catppuccin.jetbrains_icons.decorators

import com.github.catppuccin.jetbrains_icons.IconPack
import com.github.catppuccin.jetbrains_icons.settings.PluginSettingsState
import com.intellij.ide.projectView.ProjectViewNode
import com.intellij.ide.projectView.PresentationData
import com.intellij.ide.projectView.ProjectViewNodeDecorator
Expand All @@ -9,6 +10,8 @@ class PythonProjectViewNodeDecorator : ProjectViewNodeDecorator {
private var icons = IconPack.instance.icons

override fun decorate(node: ProjectViewNode<*>, data: PresentationData) {
if (!PluginSettingsState.instance.pythonSupport) return

val extension = node.virtualFile?.name?.split(".")?.last()

if (extension.equals("py")) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,49 @@ package com.github.catppuccin.jetbrains_icons.settings

import com.intellij.ide.GeneralSettings
import com.intellij.ide.IdeBundle
import com.intellij.ide.projectView.ProjectView
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.ex.ApplicationEx
import com.intellij.openapi.options.Configurable
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.ui.Messages
import javax.swing.JComponent


class PluginSettings : Configurable {
private val panel = PluginSettingsPanel(PluginSettingsState.instance.variant)
private val component = PluginSettingsComponent(PluginSettingsState.instance.variant)

override fun createComponent(): JComponent {
return panel
return component.view
}

private fun packChanged(): Boolean {
val state = PluginSettingsState.instance
return component.iconPack.variant != state.variant
}

override fun isModified(): Boolean {
val state = PluginSettingsState.instance
return panel.variant != state.variant
return packChanged() ||
component.additionalSupport.python.isSelected != state.pythonSupport
}

override fun apply() {
val state = PluginSettingsState.instance
state.variant = panel.variant
restart()

state.pythonSupport = component.additionalSupport.python.isSelected

if (packChanged()) {
state.variant = component.iconPack.variant
restart()
}

val projects = ProjectManager.getInstance().openProjects
for (project in projects) {
val projectView = ProjectView.getInstance(project)
projectView?.refresh()
projectView?.currentProjectViewPane?.updateFromRoot(true)
}
}

override fun getDisplayName(): String {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package com.github.catppuccin.jetbrains_icons.settings

import com.github.catppuccin.jetbrains_icons.settings.views.SettingsAboutView
import com.github.catppuccin.jetbrains_icons.settings.views.SettingsHeaderView
import com.github.catppuccin.jetbrains_icons.settings.views.SettingsIconPackView
import com.github.catppuccin.jetbrains_icons.settings.views.SettingsAdditionalSupportView
import com.intellij.ui.TitledSeparator
import com.intellij.util.ui.FormBuilder
import javax.swing.*

enum class Variant(val id: String, val label: String) {
LATTE("latte", "Catppuccin Latte"),
FRAPPE("frappe", "Catppuccin Frappé"),
MACCHIATO("macchiato", "Catppuccin Macchiato"),
MOCHA("mocha", "Catppuccin Mocha");

override fun toString(): String {
return label
}
}

class PluginSettingsComponent(currentVariant: String) {
var view = JPanel()
private set

var iconPack = SettingsIconPackView(currentVariant)
private set

var additionalSupport = SettingsAdditionalSupportView()
private set

init {
view = FormBuilder.createFormBuilder()
.addComponent(SettingsHeaderView())
.addComponent(TitledSeparator("General"))
.addComponent(iconPack)
.addComponent(TitledSeparator("Additional Support"))
.addComponent(additionalSupport)
.addComponent(TitledSeparator("About"))
.addComponent(SettingsAboutView())
.addComponentFillVertically(JPanel(), 0)
.panel
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import com.intellij.util.xmlb.XmlSerializerUtil
class PluginSettingsState : PersistentStateComponent<PluginSettingsState> {
var variant = Variant.MOCHA.id

var pythonSupport = true

companion object {
val instance: PluginSettingsState
get() = ApplicationManager.getApplication().getService(PluginSettingsState::class.java)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.github.catppuccin.jetbrains_icons.settings.views

import com.intellij.ide.BrowserUtil
import com.intellij.ui.components.ActionLink
import com.intellij.util.ui.FormBuilder
import java.awt.FlowLayout
import javax.swing.JPanel

class SettingsAboutView : JPanel() {
init {
val panel = FormBuilder.createFormBuilder()
.addComponent(drawChangelogLink())
.addComponent(drawIssuesLink())
.panel

add(panel)

layout = FlowLayout(FlowLayout.LEADING)
}

private fun drawChangelogLink(): ActionLink {
val link = ActionLink("Changelog") {
BrowserUtil.browse("/~https://github.com/catppuccin/jetbrains-icons/releases")
}
link.setExternalLinkIcon()
return link
}

private fun drawIssuesLink(): ActionLink {
val link = ActionLink("Report an issue") {
BrowserUtil.browse("/~https://github.com/catppuccin/jetbrains-icons/issues")
}
link.setExternalLinkIcon()
return link
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.github.catppuccin.jetbrains_icons.settings.views

import com.github.catppuccin.jetbrains_icons.settings.PluginSettingsState
import com.intellij.ui.components.JBCheckBox
import com.intellij.util.ui.FormBuilder
import java.awt.FlowLayout
import javax.swing.JPanel

class SettingsAdditionalSupportView : JPanel() {
val python = JBCheckBox("Python", PluginSettingsState.instance.pythonSupport)

init {
val form = FormBuilder.createFormBuilder()
.addComponent(python)
.addTooltip("Override the Python plugin icons")
.panel

add(form)

layout = FlowLayout(FlowLayout.LEADING)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.github.catppuccin.jetbrains_icons.settings.views

import java.awt.Component
import java.awt.Dimension
import java.awt.FlowLayout
import java.awt.GridBagConstraints
import java.awt.Image
import javax.swing.Box
import javax.swing.ImageIcon
import javax.swing.JLabel
import javax.swing.JPanel

class SettingsHeaderView : JPanel() {
init {
drawLogo()
add(Box.createRigidArea(Dimension(4, 0)))
drawTitle()
}

private fun drawLogo() {
val url = javaClass.getResource("/pluginIcon.png")
var image = ImageIcon(url)
image = ImageIcon(image.image.getScaledInstance(60, 60, Image.SCALE_SMOOTH))

val field = JLabel(image)
add(field)
}

private fun drawTitle() {
val label = JLabel("Catppuccin Icons")
label.font = label.font.deriveFont(24.0f)
add(label)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.github.catppuccin.jetbrains_icons.settings.views

import com.github.catppuccin.jetbrains_icons.settings.Variant
import com.intellij.openapi.ui.ComboBox
import com.intellij.ui.components.JBCheckBox
import com.intellij.ui.components.JBLabel
import com.intellij.util.ui.FormBuilder
import java.awt.Component
import java.awt.FlowLayout
import javax.swing.JPanel

class SettingsIconPackView(private val currentVariant: String) : JPanel() {
private val dropdown = ComboBox<Variant>()

val variant: String
get() = (dropdown.selectedItem as Variant).id

init {
drawDropdown()

val form = FormBuilder.createFormBuilder()
.addLabeledComponent(JBLabel("Variant:"), dropdown, 1, false)
.addTooltip("Restart IDE to apply changes")
.panel

add(form)

layout = FlowLayout(FlowLayout.LEADING)
}

private fun drawDropdown() {
for (variant in Variant.values()) {
dropdown.addItem(variant)
}
dropdown.selectedItem = Variant.values().find { it.id == currentVariant }
dropdown.alignmentY = Component.CENTER_ALIGNMENT
}
}
Loading