Skip to content

Commit 69b4746

Browse files
committed
python packages editor
1 parent f34120e commit 69b4746

7 files changed

Lines changed: 181 additions & 342 deletions

File tree

‎python-impl/src/main/java/com/jetbrains/python/impl/packaging/PyManagePackagesAction.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.jetbrains.python.impl.packaging;
1717

18+
import com.jetbrains.python.impl.packaging.ui.PyPackageManagementServiceProvider;
19+
import consulo.repository.ui.PackagesEditorManager;
1820
import consulo.ui.annotation.RequiredUIAccess;
1921
import consulo.ui.ex.action.AnAction;
2022
import consulo.ui.ex.action.AnActionEvent;
@@ -33,7 +35,7 @@ public void actionPerformed(AnActionEvent e) {
3335
Module module = e.getRequiredData(Module.KEY);
3436
Sdk sdk = PythonSdkType.findPythonSdk(module);
3537
if (sdk != null) {
36-
new PyManagePackagesDialog(module.getProject(), sdk).show();
38+
PackagesEditorManager.getInstance(module.getProject()).open(PyPackageManagementServiceProvider.class, sdk.getName());
3739
}
3840
}
3941

‎python-impl/src/main/java/com/jetbrains/python/impl/packaging/PyManagePackagesDialog.java‎

Lines changed: 0 additions & 101 deletions
This file was deleted.

‎python-impl/src/main/java/com/jetbrains/python/impl/packaging/PyPackageManagerUI.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import consulo.application.progress.Task;
2727
import consulo.content.bundle.Sdk;
2828
import consulo.execution.RunCanceledByUserException;
29-
import consulo.ide.impl.idea.webcore.packaging.PackagesNotificationPanel;
3029
import consulo.localize.LocalizeValue;
3130
import consulo.logging.Logger;
3231
import consulo.platform.base.icon.PlatformIconGroup;
@@ -35,7 +34,6 @@
3534
import consulo.project.ui.notification.Notification;
3635
import consulo.project.ui.notification.NotificationGroup;
3736
import consulo.project.ui.notification.NotificationService;
38-
import consulo.project.ui.notification.event.NotificationListener;
3937
import consulo.repository.ui.PackageManagementService;
4038
import consulo.ui.annotation.RequiredUIAccess;
4139
import consulo.ui.ex.awt.Messages;
@@ -52,6 +50,8 @@ public class PyPackageManagerUI {
5250
private static final Logger LOG = Logger.getInstance(PyPackageManagerUI.class);
5351

5452
@Nullable
53+
public static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.balloonGroup("Python Packaging");
54+
5555
private Listener myListener;
5656
private Project myProject;
5757
private Sdk mySdk;
@@ -147,7 +147,7 @@ private static Map<String, Set<PyPackage>> collectDependents(List<PyPackage> pac
147147
}
148148

149149
private abstract static class PackagingTask extends Task.Backgroundable {
150-
private static final NotificationGroup PACKAGING_GROUP_ID = NotificationGroup.balloonGroup("Python Packaging");
150+
private static final NotificationGroup PACKAGING_GROUP_ID = NOTIFICATION_GROUP;
151151

152152
protected final Sdk mySdk;
153153
@Nullable
@@ -199,16 +199,9 @@ protected void taskFinished(List<ExecutionException> exceptions) {
199199
PackageManagementService.ErrorDescription description = PyPackageManagementService.toErrorDescription(exceptions, mySdk);
200200
if (description != null) {
201201
String firstLine = getTitle() + ": error occurred.";
202-
NotificationListener listener = (notification, event) -> {
203-
assert myProject != null;
204-
String title = StringUtil.capitalizeWords(getFailureTitle(), true);
205-
PackagesNotificationPanel.showError(title, description);
206-
};
207-
208202
Notification.Builder builder = NotificationService.getInstance().newError(PACKAGING_GROUP_ID)
209203
.title(LocalizeValue.localizeTODO(getFailureTitle()))
210-
.content(LocalizeValue.localizeTODO(firstLine + " <a href=\"xxx\">Details...</a>"))
211-
.hyperlinkListener(listener);
204+
.content(LocalizeValue.localizeTODO(PyPackageManagementService.toNotificationHtml(firstLine, description)));
212205

213206
notificationRef.set(new PackagingNotification(builder));
214207
}

‎python-impl/src/main/java/com/jetbrains/python/impl/packaging/ui/PyInstalledPackagesPanel.java‎

Lines changed: 0 additions & 224 deletions
This file was deleted.

0 commit comments

Comments
 (0)