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

Start plugins wizard #17

Browse Source
This commit is contained in:
Vassiliy
2014-04-18 21:19:21 +04:00
parent 043fa14e57
commit c159a1ab65
4 changed files with 86 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/customize/AbstractCustomizeWizardStep.java
+37
View File
@@ -15,8 +15,16 @@
*/
package com.intellij.ide.customize;
import com.intellij.ui.ClickListener;
import com.intellij.ui.ColorUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.MouseEvent;
public abstract class AbstractCustomizeWizardStep extends JPanel {
protected static final int GAP = 20;
@@ -27,6 +35,35 @@ public abstract class AbstractCustomizeWizardStep extends JPanel {
abstract String getHTMLFooter();
private static Color getSelectionBackground() {
return ColorUtil.mix(UIUtil.getListSelectionBackground(), UIUtil.getLabelBackground(), .75);
}
protected static JPanel createBigButtonPanel(LayoutManager layout, final JToggleButton anchorButton, final Runnable action) {
final JPanel panel = new JPanel(layout) {
@Override
public Color getBackground() {
return anchorButton.isSelected() ? getSelectionBackground() : super.getBackground();
}
};
panel.setOpaque(true);
new ClickListener() {
@Override
public boolean onClick(@NotNull MouseEvent event, int clickCount) {
anchorButton.setSelected(true);
action.run();
return true;
}
}.installOn(panel);
anchorButton.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
panel.repaint();
}
});
return panel;
}
Component getDefaultFocusedComponent() {
return null;
}
platform/platform-impl/src/com/intellij/ide/customize/CustomizeFeaturedPluginsStepPanel.java
+2 -3
View File
@@ -16,7 +16,6 @@
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.PluginNode;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
@@ -86,7 +85,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
};
final CardLayout wrapperLayout = new CardLayout();
final JPanel buttonWrapper = new JPanel(wrapperLayout);
final JButton installButton = new JButton("Install", AllIcons.General.DownloadPlugin);
final JButton installButton = new JButton("Install");
final JProgressBar progressBar = new JProgressBar(0, 100);
progressBar.setStringPainted(true);
buttonWrapper.add(installButton, "button");
@@ -203,7 +202,7 @@ public class CustomizeFeaturedPluginsStepPanel extends AbstractCustomizeWizardSt
@Override
public String getHTMLHeader() {
return "<html><body><h2>Download featured plugins</h2>" +
"We have a few plugins in our repository that most users like to download." +
"We have a few plugins in our repository that most users like to download. " +
"Perhaps, you need them too?</body></html>";
}
platform/platform-impl/src/com/intellij/ide/customize/CustomizeKeyboardSchemeStepPanel.java
+40 -51
View File
@@ -23,74 +23,63 @@ import com.intellij.openapi.ui.VerticalFlowLayout;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class CustomizeKeyboardSchemeStepPanel extends AbstractCustomizeWizardStep {
private final JToggleButton myMacButton;
private final JToggleButton myDefaultButton;
private final JPanel myMacPanel;
private final JPanel myDefaultPanel;
public CustomizeKeyboardSchemeStepPanel() {//&#8997; alt
setLayout(new GridLayout(1, 2, GAP, GAP));
myMacButton = new JToggleButton();
myMacButton.setLayout(new VerticalFlowLayout());
final JRadioButton macRadioButton =
new JRadioButton("I've never used " + ApplicationNamesInfo.getInstance().getProductName() + " or am a Mac user");
myMacButton.add(macRadioButton);
myMacButton.add(new JLabel("<html><body><h3>" + KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP + " keymap</h3>" +
"Adapted for Mac<br><br><table><tr><td colspan=\"2\">EXAMPLES</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;N</td><td style=\"text-align:left;\">Generate</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;O</td><td style=\"text-align:left;\">Go to class</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;&#9003;</td><td style=\"text-align:left;\">Delete line</td></tr>" +
"</table></body></html>"
));
add(myMacButton);
myDefaultButton = new JToggleButton();
myDefaultButton.setLayout(new VerticalFlowLayout());
final JRadioButton defaultRadioButton =
new JRadioButton("I used " + ApplicationNamesInfo.getInstance().getProductName() + " before or am a Windows user");
myDefaultButton.add(defaultRadioButton);
myDefaultButton.add(new JLabel("<html><body><h3>" + KeymapManager.MAC_OS_X_KEYMAP + " keymap</h3>" +
"Default for all platforms<br><br><table><tr><td colspan=\"2\">EXAMPLES</td></tr>" +
"<tr><td style=\"text-align:right;\">^N</td><td style=\"text-align:left;\">Generate</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;N</td><td style=\"text-align:left;\">Go to class</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;Y</td><td style=\"text-align:left;\">Delete line</td></tr>" +
"</table></body></html>"
));
defaultRadioButton.setOpaque(false);
macRadioButton.setOpaque(false);
add(myMacButton);
add(myDefaultButton);
ButtonGroup group = new ButtonGroup();
ButtonGroup subGroup = new ButtonGroup();
group.add(myMacButton);
group.add(myDefaultButton);
myMacButton.addActionListener(new ActionListener() {
myMacPanel = createBigButtonPanel(new VerticalFlowLayout(), macRadioButton, new Runnable() {
@Override
public void actionPerformed(ActionEvent e) {
macRadioButton.setSelected(myMacButton.isSelected());
public void run() {
StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP);
}
});
myDefaultButton.addActionListener(new ActionListener() {
String style = "<style type=\"text/css\">" +
"body {margin-left:"+ GAP +"px; border:none;padding:0px;}"+
"table {margin:0px; cell-padding:0px; border:none;}"+
"</style>";
myMacPanel.add(macRadioButton);
myMacPanel.add(
new JLabel("<html><head>"+style+"</head><body><h3>" + KeymapManager.MAC_OS_X_10_5_PLUS_KEYMAP + " keymap</h3>" +
"Adapted for Mac<br><br><table><tr><td align=\"left\" colspan=\"2\">EXAMPLES</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;N</td><td style=\"text-align:left;\">Generate</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;O</td><td style=\"text-align:left;\">Go to class</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;&#9003;</td><td style=\"text-align:left;\">Delete line</td></tr>" +
"</table></body></html>"
));
add(myMacPanel);
final JRadioButton defaultRadioButton =
new JRadioButton("I used " + ApplicationNamesInfo.getInstance().getProductName() + " before or am a Windows user");
defaultRadioButton.setOpaque(false);
myDefaultPanel = createBigButtonPanel(new VerticalFlowLayout(),defaultRadioButton, new Runnable() {
@Override
public void actionPerformed(ActionEvent e) {
defaultRadioButton.setSelected(myDefaultButton.isSelected());
public void run() {
StartupUtil.setMyWizardMacKeymap(KeymapManager.MAC_OS_X_KEYMAP);
}
});
subGroup.add(macRadioButton);
subGroup.add(defaultRadioButton);
myDefaultButton.setSelected(true);
defaultRadioButton.setSelected(true);
}
} );
myDefaultPanel.add(defaultRadioButton);
myDefaultPanel.add(new JLabel("<html><head>" + style + "</head><body><h3>" + KeymapManager.MAC_OS_X_KEYMAP + " keymap</h3>" +
"Default for all platforms<br><br><table><tr><td align=\"left\" colspan=\"2\">EXAMPLES</td></tr>" +
"<tr><td style=\"text-align:right;\">^N</td><td style=\"text-align:left;\">Generate</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;N</td><td style=\"text-align:left;\">Go to class</td></tr>" +
"<tr><td style=\"text-align:right;\">&#8984;Y</td><td style=\"text-align:left;\">Delete line</td></tr>" +
"</table></body></html>"
));
@Override
Component getDefaultFocusedComponent() {
return myMacButton.isSelected() ? myMacButton : myDefaultButton;
add(myMacPanel);
add(myDefaultPanel);
ButtonGroup group = new ButtonGroup();
group.add(macRadioButton);
group.add(defaultRadioButton);
defaultRadioButton.setSelected(true);
}
@Override
platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
+7 -25
View File
@@ -24,16 +24,14 @@ import com.intellij.idea.StartupUtil;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.ui.ClickListener;
import com.intellij.util.IconUtil;
import com.intellij.util.PlatformUtils;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -44,7 +42,6 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
private static final String INTELLIJ = "IntelliJ";
private static final String ALLOY = "Alloy. IDEA Theme";
private static final String GTK = "GTK+";
private Component myDefaultFocusedComponent;
private boolean myInitial = true;
private boolean myColumnMode;
private JLabel myPreviewLabel;
@@ -84,17 +81,15 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
radioButton.setOpaque(false);
if (myDefaultLafName == null) {
radioButton.setSelected(true);
myDefaultFocusedComponent = radioButton;
myDefaultLafName = lafName;
}
final JPanel panel = new JPanel(new BorderLayout(10, 10)) {
final JPanel panel = createBigButtonPanel(new BorderLayout(10, 10), radioButton, new Runnable() {
@Override
public Color getBackground() {
return radioButton.isSelected() ? UIUtil.getListSelectionBackground() : super.getBackground();
public void run() {
applyLaf(lafName, CustomizeUIThemeStepPanel.this);
}
};
});
panel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
panel.setOpaque(true);
panel.add(radioButton, BorderLayout.NORTH);
final JLabel label = new JLabel(myColumnMode ? IconUtil.scale(icon, .2) : icon) {
@Override
@@ -104,16 +99,8 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
return size;
}
};
label.setVerticalAlignment(SwingConstants.TOP);
panel.add(label, BorderLayout.CENTER);
new ClickListener(){
@Override
public boolean onClick(@NotNull MouseEvent event, int clickCount) {
radioButton.setSelected(true);
applyLaf(lafName, CustomizeUIThemeStepPanel.this);
return true;
}
}.installOn(label);
radioButton.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
@@ -137,11 +124,6 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
myInitial = false;
}
@Override
Component getDefaultFocusedComponent() {
return myDefaultFocusedComponent;
}
@Override
public Dimension getPreferredSize() {
Dimension size = super.getPreferredSize();