Skip to content
Open
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
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
// https://github.com/JetBrains/gradle-intellij-plugin
id 'org.jetbrains.intellij' version '1.15.0'
id 'org.jetbrains.intellij' version '1.17.4'
}
tasks.withType(JavaCompile).configureEach {
options.encoding = "UTF-8"
Expand Down Expand Up @@ -43,7 +43,7 @@ dependencies {

// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
setVersion "2023.2.1"
setVersion "2024.2"
setType "IC"
setPluginName 'Notebook'
setUpdateSinceUntilBuild false
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
package com.itcodebox.notebooks.action;

import com.intellij.ide.actions.ActivateToolWindowAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.ToolWindow;
import com.intellij.openapi.wm.ToolWindowManager;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.*;
import com.intellij.openapi.wm.*;
import com.itcodebox.notebooks.constant.PluginConstant;
import com.itcodebox.notebooks.projectservice.NotebooksUIManager;
import com.itcodebox.notebooks.ui.panes.MainPanel;
import com.itcodebox.notebooks.utils.FocusUtil;
import org.jetbrains.annotations.NotNull;

public class ActivateNotebookAction extends DumbAwareAction {

Expand All @@ -37,4 +35,10 @@ public void actionPerformed(AnActionEvent e) {
FocusUtil.getEditorFocus(mainPanel);

}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.itcodebox.notebooks.action;

import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.SelectionModel;
import com.intellij.openapi.project.DumbAwareAction;
Expand Down Expand Up @@ -75,4 +74,10 @@ public void actionPerformed(AnActionEvent e) {
//显示添加对话框
new AddNoteDialog(project, note).show();
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
package com.itcodebox.notebooks.action;

import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.project.*;
import com.intellij.openapi.ui.popup.*;
import com.intellij.psi.PsiFile;
import com.intellij.ui.BalloonImpl;
import com.intellij.ui.popup.BalloonPopupBuilderImpl;
import com.intellij.util.ui.JBUI;
import com.itcodebox.notebooks.constant.PluginColors;
import org.jetbrains.annotations.NotNull;

import javax.swing.*;

/**
Expand All @@ -39,15 +34,17 @@ public void update(@NotNull AnActionEvent e) {
&& psiFile != null
);
}

@Override
public void actionPerformed(@NotNull AnActionEvent e) {
Editor editor = e.getRequiredData(CommonDataKeys.EDITOR);
Editor editor = e.getRequiredData(CommonDataKeys.EDITOR);
Project project = e.getRequiredData(CommonDataKeys.PROJECT);
InsertPanelFactory factory = new InsertPanelFactory();
JPanel insertCodePanel = factory.createInsertPanel(project, editor);

BalloonImpl balloon = (BalloonImpl) new BalloonPopupBuilderImpl(null,insertCodePanel).setShadow(true)

Balloon balloon = JBPopupFactory.getInstance()
.createDialogBalloonBuilder(insertCodePanel, null)
.setShadow(true)
.setDialogMode(true)
.setRequestFocus(true)
.setHideOnAction(true)
Expand All @@ -61,8 +58,21 @@ public void actionPerformed(@NotNull AnActionEvent e) {
.setBorderColor(PluginColors.INSERT_BALLOON_BORDER)
.setFillColor(JBUI.CurrentTheme.CustomFrameDecorations.paneBackground())
.createBalloon();
balloon.setHideListener(balloon::hide);
factory.setBalloonImpl(balloon);

balloon.addListener(new JBPopupListener() {
@Override
public void onClosed(@NotNull LightweightWindowEvent event) {
balloon.hide();
}
});

factory.setBalloonImpl((BalloonImpl) balloon);
balloon.show(JBPopupFactory.getInstance().guessBestPopupLocation(editor), Balloon.Position.atRight);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
package com.itcodebox.notebooks.action;

import com.intellij.ide.actions.ActivateToolWindowAction;
import com.intellij.ide.actions.GotoActionBase;
import com.intellij.ide.actions.*;
import com.intellij.ide.util.gotoByName.ChooseByNamePopup;
import com.intellij.navigation.ChooseByNameContributor;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.wm.ToolWindow;
import com.intellij.openapi.wm.ToolWindowManager;
import com.itcodebox.notebooks.entity.NoteNavigationItem;
import com.itcodebox.notebooks.entity.SearchRecord;
import com.intellij.openapi.wm.*;
import com.itcodebox.notebooks.entity.*;
import com.itcodebox.notebooks.projectservice.NotebooksUIManager;
import com.itcodebox.notebooks.service.impl.NoteChooseByname;
import com.itcodebox.notebooks.ui.model.NoteFilterModel;
import com.itcodebox.notebooks.ui.panes.MainPanel;
import com.itcodebox.notebooks.ui.tables.ChapterTable;
import com.itcodebox.notebooks.ui.tables.NoteTable;
import com.itcodebox.notebooks.ui.tables.NotebookTable;
import com.itcodebox.notebooks.ui.tables.*;
import com.itcodebox.notebooks.utils.FocusUtil;
import org.jetbrains.annotations.NotNull;

import javax.swing.*;

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -92,5 +85,11 @@ public void elementChosen(ChooseByNamePopup chooseByNamePopup, Object o) {

showNavigationPopup(e, model, callback);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.itcodebox.notebooks.action;

import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
import com.itcodebox.notebooks.ui.dialog.SearchDialog;
Expand All @@ -25,4 +24,10 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
Project project = anActionEvent.getRequiredData(CommonDataKeys.PROJECT);
new SearchDialog(project).show();
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
}
38 changes: 35 additions & 3 deletions src/main/java/com/itcodebox/notebooks/ui/NoteWindowFactory.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.itcodebox.notebooks.ui;

import com.intellij.icons.AllIcons;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.actionSystem.Separator;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserFactory;
Expand Down Expand Up @@ -96,6 +94,11 @@ public void actionPerformed(@NotNull AnActionEvent e) {
}

}
@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand All @@ -108,6 +111,12 @@ public void actionPerformed(@NotNull AnActionEvent e) {
ApplicationManager.getApplication().getMessageBus().syncPublisher(RecordListener.TOPIC)
.onRefresh();
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand All @@ -118,6 +127,11 @@ private DumbAwareAction initTipsAction() {
public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
new TipForUsingDialog().show();
}
@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand Down Expand Up @@ -146,6 +160,12 @@ public void actionPerformed(@NotNull AnActionEvent e) {
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(!AppSettingsState.getInstance().readOnlyMode);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand All @@ -164,6 +184,12 @@ public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) {
.syncPublisher(AppSettingsChangedListener.TOPIC)
.onSetItemExpandable(b);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand Down Expand Up @@ -213,6 +239,12 @@ public boolean isFileSelectable(VirtualFile file) {
public void update(@NotNull AnActionEvent e) {
e.getPresentation().setEnabled(!AppSettingsState.getInstance().readOnlyMode);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
};
}

Expand Down
21 changes: 18 additions & 3 deletions src/main/java/com/itcodebox/notebooks/ui/notify/NotifyUtil.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.itcodebox.notebooks.ui.notify;

import com.intellij.notification.*;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.EmptyAction;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.project.Project;
Expand Down Expand Up @@ -53,6 +51,12 @@ public static void showTemplateErrorNotification(Project project, String display
public void actionPerformed(@NotNull AnActionEvent e) {
ShowSettingsUtil.getInstance().showSettingsDialog(project, AppSettingsConfigurable.class);
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
});
Notifications.Bus.notify(notification, project);
}
Expand All @@ -64,6 +68,11 @@ public static void showErrorNotification(Project project, String displayId, Stri
public void actionPerformed(@NotNull AnActionEvent e) {
PluginConstant.CLIPBOARD.setContents(new StringSelection(errorMessage), null);
}
@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
});
Notifications.Bus.notify(notification, project);
}
Expand All @@ -75,6 +84,12 @@ public static void showImportErrorNotification(Project project, String displayId
public void actionPerformed(@NotNull AnActionEvent e) {
new ImportErrorDialog(errorMessage).show();
}

@Override
public @NotNull ActionUpdateThread getActionUpdateThread ()
{
return ActionUpdateThread.BGT;
}
});
Notifications.Bus.notify(notification, project);
}
Expand Down
Loading