MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

CPP-613 Switch on welcome wizard for all users

Browse Source
This commit is contained in:
Alexander Lobas
2014-08-27 16:46:25 +04:00
parent 6a0ea32dfe
commit e41098c787
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+2 -1
View File
@@ -18,6 +18,7 @@ package com.intellij.ide.customize;
import com.intellij.CommonBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManagerCore;
import com.intellij.ide.plugins.PluginNode;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
import com.intellij.openapi.ui.VerticalFlowLayout;
@@ -78,7 +79,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
final String pluginId = s.substring(j + 1);
IdeaPluginDescriptor foundDescriptor = null;
for (IdeaPluginDescriptor descriptor : pluginsFromRepository) {
if (descriptor.getPluginId().getIdString().equals(pluginId)) {
if (descriptor.getPluginId().getIdString().equals(pluginId) && !PluginManagerCore.isBrokenPlugin(descriptor)) {
foundDescriptor = descriptor;
isEmptyOrOffline = false;
break;
platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardDialog.java
+15 -5
View File
@@ -80,6 +80,12 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
protected void initSteps() {
provider.initSteps(this, mySteps);
}
@Override
protected void createButtons(JPanel buttonPanel, GridBagConstraints gbc) {
provider.addButtons(this, buttonPanel, gbc);
super.createButtons(buttonPanel, gbc);
}
}.show();
}
@@ -131,6 +137,15 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
gbc.fill = GridBagConstraints.BOTH;
gbc.gridx = 0;
gbc.gridy = 0;
createButtons(buttonPanel, gbc);
buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
myButtonWrapper.add(buttonPanel, BUTTONS);
myButtonWrapper.add(new JLabel(), NOBUTTONS);
myButtonWrapperLayout.show(myButtonWrapper, BUTTONS);
return myButtonWrapper;
}
protected void createButtons(JPanel buttonPanel, GridBagConstraints gbc) {
buttonPanel.add(myBackButton, gbc);
gbc.gridx++;
gbc.weightx = 1;
@@ -140,11 +155,6 @@ public class CustomizeIDEWizardDialog extends DialogWrapper implements ActionLis
buttonPanel.add(myNextButton, gbc);
gbc.gridx++;
buttonPanel.add(myStartUsingButton, gbc);
buttonPanel.setBorder(BorderFactory.createEmptyBorder(8, 0, 0, 0));
myButtonWrapper.add(buttonPanel, BUTTONS);
myButtonWrapper.add(new JLabel(), NOBUTTONS);
myButtonWrapperLayout.show(myButtonWrapper, BUTTONS);
return myButtonWrapper;
}
void setButtonsVisible(boolean visible) {
platform/platform-impl/src/com/intellij/ide/customize/CustomizeIDEWizardStepsProvider.java
+4
View File
@@ -15,6 +15,8 @@
*/
package com.intellij.ide.customize;
import javax.swing.*;
import java.awt.*;
import java.util.List;
/**
@@ -22,4 +24,6 @@ import java.util.List;
*/
public interface CustomizeIDEWizardStepsProvider {
void initSteps(CustomizeIDEWizardDialog wizardDialog, List<AbstractCustomizeWizardStep> steps);
void addButtons(CustomizeIDEWizardDialog wizardDialog, JPanel buttonPanel, GridBagConstraints gbc);
}