From 37e5c4e9b5ae2dff1b4169a1ae06063acc7e0542 Mon Sep 17 00:00:00 2001 From: MD Towhidul Islam Date: Tue, 17 Dec 2024 22:22:21 +0600 Subject: [PATCH] provide support for 2024.3+ --- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../action/ActivateNotebookAction.java | 16 +-- .../notebooks/action/EditorAddNoteAction.java | 9 +- .../action/EditorInsertCodeAction.java | 38 +++++--- .../notebooks/action/OpenSearchBarAction.java | 23 +++-- .../notebooks/action/SearchRecordAction.java | 9 +- .../notebooks/ui/NoteWindowFactory.java | 38 +++++++- .../notebooks/ui/notify/NotifyUtil.java | 21 +++- .../notebooks/ui/panes/DetailPanel.java | 73 +++++++++++++- .../itcodebox/notebooks/utils/ImportUtil.java | 97 +++++++++---------- src/main/resources/META-INF/plugin.xml | 4 +- 12 files changed, 229 insertions(+), 105 deletions(-) diff --git a/build.gradle b/build.gradle index b5af0b1..4215209 100644 --- a/build.gradle +++ b/build.gradle @@ -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" @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..0d18421 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/main/java/com/itcodebox/notebooks/action/ActivateNotebookAction.java b/src/main/java/com/itcodebox/notebooks/action/ActivateNotebookAction.java index 5d211f0..285c125 100644 --- a/src/main/java/com/itcodebox/notebooks/action/ActivateNotebookAction.java +++ b/src/main/java/com/itcodebox/notebooks/action/ActivateNotebookAction.java @@ -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 { @@ -37,4 +35,10 @@ public void actionPerformed(AnActionEvent e) { FocusUtil.getEditorFocus(mainPanel); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/com/itcodebox/notebooks/action/EditorAddNoteAction.java b/src/main/java/com/itcodebox/notebooks/action/EditorAddNoteAction.java index 8d91192..a23c7e6 100644 --- a/src/main/java/com/itcodebox/notebooks/action/EditorAddNoteAction.java +++ b/src/main/java/com/itcodebox/notebooks/action/EditorAddNoteAction.java @@ -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; @@ -75,4 +74,10 @@ public void actionPerformed(AnActionEvent e) { //显示添加对话框 new AddNoteDialog(project, note).show(); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/com/itcodebox/notebooks/action/EditorInsertCodeAction.java b/src/main/java/com/itcodebox/notebooks/action/EditorInsertCodeAction.java index 83fcd66..59e27b0 100644 --- a/src/main/java/com/itcodebox/notebooks/action/EditorInsertCodeAction.java +++ b/src/main/java/com/itcodebox/notebooks/action/EditorInsertCodeAction.java @@ -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.*; /** @@ -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) @@ -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; + } } diff --git a/src/main/java/com/itcodebox/notebooks/action/OpenSearchBarAction.java b/src/main/java/com/itcodebox/notebooks/action/OpenSearchBarAction.java index c43600f..55a912f 100644 --- a/src/main/java/com/itcodebox/notebooks/action/OpenSearchBarAction.java +++ b/src/main/java/com/itcodebox/notebooks/action/OpenSearchBarAction.java @@ -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") @@ -92,5 +85,11 @@ public void elementChosen(ChooseByNamePopup chooseByNamePopup, Object o) { showNavigationPopup(e, model, callback); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } } diff --git a/src/main/java/com/itcodebox/notebooks/action/SearchRecordAction.java b/src/main/java/com/itcodebox/notebooks/action/SearchRecordAction.java index 905aa30..8140c90 100644 --- a/src/main/java/com/itcodebox/notebooks/action/SearchRecordAction.java +++ b/src/main/java/com/itcodebox/notebooks/action/SearchRecordAction.java @@ -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; @@ -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; + } } diff --git a/src/main/java/com/itcodebox/notebooks/ui/NoteWindowFactory.java b/src/main/java/com/itcodebox/notebooks/ui/NoteWindowFactory.java index 093a6a7..5686688 100644 --- a/src/main/java/com/itcodebox/notebooks/ui/NoteWindowFactory.java +++ b/src/main/java/com/itcodebox/notebooks/ui/NoteWindowFactory.java @@ -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; @@ -96,6 +94,11 @@ public void actionPerformed(@NotNull AnActionEvent e) { } } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -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; + } }; } @@ -118,6 +127,11 @@ private DumbAwareAction initTipsAction() { public void actionPerformed(@NotNull AnActionEvent anActionEvent) { new TipForUsingDialog().show(); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -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; + } }; } @@ -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; + } }; } @@ -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; + } }; } diff --git a/src/main/java/com/itcodebox/notebooks/ui/notify/NotifyUtil.java b/src/main/java/com/itcodebox/notebooks/ui/notify/NotifyUtil.java index aaffc22..ee6aa6a 100644 --- a/src/main/java/com/itcodebox/notebooks/ui/notify/NotifyUtil.java +++ b/src/main/java/com/itcodebox/notebooks/ui/notify/NotifyUtil.java @@ -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; @@ -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); } @@ -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); } @@ -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); } diff --git a/src/main/java/com/itcodebox/notebooks/ui/panes/DetailPanel.java b/src/main/java/com/itcodebox/notebooks/ui/panes/DetailPanel.java index b4ea096..ca71068 100644 --- a/src/main/java/com/itcodebox/notebooks/ui/panes/DetailPanel.java +++ b/src/main/java/com/itcodebox/notebooks/ui/panes/DetailPanel.java @@ -2,10 +2,7 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; -import com.intellij.openapi.actionSystem.ActionManager; -import com.intellij.openapi.actionSystem.ActionToolbar; -import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.DefaultActionGroup; +import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.*; @@ -661,6 +658,12 @@ public void actionPerformed(@NotNull AnActionEvent e) { e.getPresentation().setIcon(descScrollPane.isVisible() ? PluginIcons.Hide : PluginIcons.Show); e.getPresentation().setText(descScrollPane.isVisible() ? message("detailPanel.action.showDesc.hide") : message("detailPanel.action.showDesc.show")); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -672,6 +675,11 @@ public void actionPerformed(@NotNull AnActionEvent e) { northPanel.setVisible(!northPanel.isVisible()); e.getPresentation().setIcon(northPanel.isVisible() ? AllIcons.Actions.Collapseall : AllIcons.Actions.Expandall); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -691,6 +699,11 @@ public void update(@NotNull AnActionEvent e) { Note selectedNote = noteTable.getSelectedObject(); e.getPresentation().setEnabled(selectedNote != null && !selectedNote.getContent().isEmpty()); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -776,6 +789,12 @@ public void update(@NotNull AnActionEvent e) { Note selectedNote = noteTable.getSelectedObject(); e.getPresentation().setEnabled(selectedNote != null && !selectedNote.getSource().isEmpty()); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } }; } @@ -805,6 +824,12 @@ public void update(@NotNull AnActionEvent e) { Editor selectedTextEditor = FileEditorManager.getInstance(project).getSelectedTextEditor(); e.getPresentation().setEnabled(selectedNote != null && !selectedNote.getContent().isEmpty() && selectedTextEditor != null && selectedTextEditor.getDocument().isWritable()); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } @@ -814,7 +839,13 @@ private DumbAwareAction initActionAddNote() { public void actionPerformed(@NotNull AnActionEvent anActionEvent) { getNotePanel().doAddNote(); } - + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + @Override public void update(@NotNull AnActionEvent e) { e.getPresentation().setEnabled(!AppSettingsState.getInstance().readOnlyMode); @@ -891,6 +922,12 @@ private boolean isImageInfoChanged() { return imageInfoChanged; } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } @@ -948,6 +985,12 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) { public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) { controlViewVisible(true, true, true); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } @@ -962,6 +1005,12 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) { public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) { controlViewVisible(false, true, true); } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } @@ -976,6 +1025,13 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) { public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) { controlViewVisible(false, false, true); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } @@ -990,6 +1046,13 @@ public boolean isSelected(@NotNull AnActionEvent anActionEvent) { public void setSelected(@NotNull AnActionEvent anActionEvent, boolean b) { controlViewVisible(false, false, false); } + + @Override + public @NotNull ActionUpdateThread getActionUpdateThread () + { + return ActionUpdateThread.BGT; + } + }; } diff --git a/src/main/java/com/itcodebox/notebooks/utils/ImportUtil.java b/src/main/java/com/itcodebox/notebooks/utils/ImportUtil.java index dfda646..c860cd5 100644 --- a/src/main/java/com/itcodebox/notebooks/utils/ImportUtil.java +++ b/src/main/java/com/itcodebox/notebooks/utils/ImportUtil.java @@ -3,37 +3,23 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.intellij.openapi.application.Application; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.progress.Task; +import com.intellij.openapi.application.*; +import com.intellij.openapi.progress.*; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.ui.*; +import com.intellij.openapi.ui.messages.MessagesService; import com.intellij.openapi.vfs.VirtualFile; import com.itcodebox.notebooks.constant.PluginConstant; -import com.itcodebox.notebooks.entity.Chapter; -import com.itcodebox.notebooks.entity.Note; -import com.itcodebox.notebooks.entity.Notebook; +import com.itcodebox.notebooks.entity.*; import com.itcodebox.notebooks.projectservice.RecordListener; -import com.itcodebox.notebooks.service.impl.ChapterServiceImpl; -import com.itcodebox.notebooks.service.impl.NoteServiceImpl; -import com.itcodebox.notebooks.service.impl.NotebookServiceImpl; +import com.itcodebox.notebooks.service.impl.*; import com.itcodebox.notebooks.ui.notify.NotifyUtil; -import com.itcodebox.notebooks.ui.toolsettings.AppSettingsChangedListener; -import com.itcodebox.notebooks.ui.toolsettings.AppSettingsState; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; +import com.itcodebox.notebooks.ui.toolsettings.*; +import org.jetbrains.annotations.*; +import java.io.*; import java.nio.file.Path; import java.util.*; import java.util.concurrent.atomic.AtomicReference; - import static com.itcodebox.notebooks.utils.NotebooksBundle.message; /** @@ -332,37 +318,42 @@ private static void addNotesFromJson(ProgressIndicator indicator, Notebook noteb * @param title Notebook的标题 * @return 用户的选择 */ - private static UserChoose nameConflictDialog(String title) { + private static UserChoose nameConflictDialog (String title) { UserChoose userChoose = new UserChoose(); - Messages.showDialog( - "" + - message("notify.import.nameConflict.message1") + "
" + - "" + message("notify.import.nameConflict.message2") + "" + title + "
" + - "" - , message("notify.import.nameConflict.title"), - new String[]{ - //0 - message("notify.import.nameConflict.chooseOverwrite"), - //1 - message("notify.import.nameConflict.chooseSkip"), - //2 - message("notify.import.nameConflict.chooseUpdate"), - //3 - message("notify.import.nameConflict.chooseAutoRename") - }, 1, Messages.getWarningIcon(), new DialogWrapper.DoNotAskOption.Adapter() { - - @Override - public void rememberChoice(boolean isSelected, int exitCode) { - userChoose.setDoNotAsk(isSelected); - userChoose.setExitCode(exitCode); - } - - @Override - public @NotNull String getDoNotShowMessage() { - return message("notify.import.nameConflict.rememberChoose"); - } - } - ); + + String message = "" + + message("notify.import.nameConflict.message1") + "
" + + "" + message("notify.import.nameConflict.message2") + "" + title + "
" + + ""; + String msgTitle = message("notify.import.nameConflict.title"); + String[] options = { + //0 + message("notify.import.nameConflict.chooseOverwrite"), + //1 + message("notify.import.nameConflict.chooseSkip"), + //2 + message("notify.import.nameConflict.chooseUpdate"), + //3 + message("notify.import.nameConflict.chooseAutoRename") + }; + DoNotAskOption.Adapter adapter = new DoNotAskOption.Adapter() + { + + @Override + public void rememberChoice (boolean isSelected, int exitCode) + { + userChoose.setDoNotAsk(isSelected); + userChoose.setExitCode(exitCode); + } + + @Override + public @NotNull String getDoNotShowMessage () + { + return message("notify.import.nameConflict.rememberChoose"); + } + }; + + MessagesService.getInstance().showMessageDialog(null, null, message, msgTitle, options, 1, -1, Messages.getWarningIcon(), adapter, false, null); return userChoose; } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index b22b3dd..ca66f87 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ com.itcodebox.leewyatt.notebooks.id Notebook - 1.39 + 1.40 LeeWyatt - + messages.NotebooksBundle