From 3a355143bd965d8a7800e3144259184365e0d914 Mon Sep 17 00:00:00 2001 From: Carl-Robert Linnupuu Date: Thu, 9 Nov 2023 19:08:22 +0200 Subject: [PATCH] Minor UI updates --- .../service/LlamaModelPreferencesForm.java | 2 +- .../service/LlamaServiceSelectionForm.java | 38 +++++++++++-------- .../resources/messages/codegpt.properties | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaModelPreferencesForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaModelPreferencesForm.java index 2d8fde212..460cd87a4 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaModelPreferencesForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaModelPreferencesForm.java @@ -85,7 +85,7 @@ public LlamaModelPreferencesForm() { progressLabel = new JBLabel(""); progressLabel.setBorder(JBUI.Borders.emptyLeft(2)); progressLabel.setFont(JBUI.Fonts.smallFont()); - modelExistsIcon = new JBLabel(Actions.Commit); + modelExistsIcon = new JBLabel(Actions.Checked); modelExistsIcon.setVisible(isModelExists(llamaSettings.getHuggingFaceModel())); helpIcon = new JBLabel(General.ContextHelp); huggingFaceComboBoxModel = new DefaultComboBoxModel<>(); diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaServiceSelectionForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaServiceSelectionForm.java index dfac9d853..aa1072cb0 100644 --- a/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaServiceSelectionForm.java +++ b/src/main/java/ee/carlrobert/codegpt/settings/service/LlamaServiceSelectionForm.java @@ -62,7 +62,8 @@ public LlamaServiceSelectionForm() { } else { if (!isModelExists(llamaModelPreferencesForm.getSelectedModel())) { OverlayUtils.showBalloon( - CodeGPTBundle.get("settingsConfigurable.service.llama.overlay.modelNotDownloaded.text"), + CodeGPTBundle.get( + "settingsConfigurable.service.llama.overlay.modelNotDownloaded.text"), MessageType.ERROR, llamaModelPreferencesForm.getHuggingFaceModelComboBox()); return; @@ -71,15 +72,19 @@ public LlamaServiceSelectionForm() { if (llamaServerAgent.isServerRunning()) { setFormEnabled(true); - serverButton.setText(CodeGPTBundle.get("settingsConfigurable.service.llama.startServer.label")); + serverButton.setText( + CodeGPTBundle.get("settingsConfigurable.service.llama.startServer.label")); serverButton.setIcon(Actions.Execute); - serverProgressPanel.updateText(CodeGPTBundle.get("settingsConfigurable.service.llama.progress.stoppingServer")); + serverProgressPanel.updateText( + CodeGPTBundle.get("settingsConfigurable.service.llama.progress.stoppingServer")); llamaServerAgent.stopAgent(); } else { setFormEnabled(false); - serverButton.setText(CodeGPTBundle.get("settingsConfigurable.service.llama.stopServer.label")); + serverButton.setText( + CodeGPTBundle.get("settingsConfigurable.service.llama.stopServer.label")); serverButton.setIcon(Actions.Suspend); - serverProgressPanel.startProgress(CodeGPTBundle.get("settingsConfigurable.service.llama.progress.startingServer")); + serverProgressPanel.startProgress( + CodeGPTBundle.get("settingsConfigurable.service.llama.progress.startingServer")); // TODO: Move to LlamaModelPreferencesForm var modelPath = llamaModelPreferencesForm.isUseCustomLlamaModel() ? @@ -94,10 +99,8 @@ public LlamaServiceSelectionForm() { serverProgressPanel, () -> { setFormEnabled(false); - serverProgressPanel.displayComponent(new JBLabel( - "Server running", - Actions.Commit, - SwingConstants.LEADING)); + serverProgressPanel.displayComponent( + new JBLabel("Server running", Actions.Checked, SwingConstants.LEADING)); }); } }); @@ -109,15 +112,20 @@ public LlamaServiceSelectionForm() { setLayout(new BorderLayout()); add(FormBuilder.createFormBuilder() - .addComponent(new TitledSeparator(CodeGPTBundle.get("settingsConfigurable.service.llama.modelPreferences.title"))) + .addComponent(new TitledSeparator( + CodeGPTBundle.get("settingsConfigurable.service.llama.modelPreferences.title"))) .addComponent(withEmptyLeftBorder(llamaModelPreferencesForm.getForm())) - .addComponent(new TitledSeparator(CodeGPTBundle.get("settingsConfigurable.service.llama.serverPreferences.title"))) + .addComponent(new TitledSeparator( + CodeGPTBundle.get("settingsConfigurable.service.llama.serverPreferences.title"))) .addComponent(withEmptyLeftBorder(FormBuilder.createFormBuilder() - .addLabeledComponent(CodeGPTBundle.get("settingsConfigurable.service.llama.contextSize.label"), maxTokensField) + .addLabeledComponent( + CodeGPTBundle.get("settingsConfigurable.service.llama.contextSize.label"), + maxTokensField) .addComponentToRightColumn(contextSizeHelpText) - .addLabeledComponent(CodeGPTBundle.get("settingsConfigurable.service.llama.port.label"), JBUI.Panels.simplePanel() - .addToLeft(portField) - .addToRight(serverButton)) + .addLabeledComponent(CodeGPTBundle.get("settingsConfigurable.service.llama.port.label"), + JBUI.Panels.simplePanel() + .addToLeft(portField) + .addToRight(serverButton)) .getPanel())) .addVerticalGap(4) .addComponent(withEmptyLeftBorder(serverProgressPanel)) diff --git a/src/main/resources/messages/codegpt.properties b/src/main/resources/messages/codegpt.properties index d7e0336b2..84a54dc8d 100644 --- a/src/main/resources/messages/codegpt.properties +++ b/src/main/resources/messages/codegpt.properties @@ -107,7 +107,7 @@ toolwindow.chat.youProCheckBox.text=Use GPT-4 model toolwindow.chat.youProCheckBox.enable=Turn on for complex queries toolwindow.chat.youProCheckBox.disable=Turn off for faster responses toolwindow.chat.youProCheckBox.notAllowed=Enable by subscribing to YouPro plan -toolwindow.chat.textArea.emptyText=Ask me anything +toolwindow.chat.textArea.emptyText=Ask me anything... service.openai.title=OpenAI Service service.azure.title=Azure Service service.you.title=You.com Service (Free, Cloud)