images plugin now part of a CE

.idea/modules.xml

@@ -35,7 +35,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt/groovy-rt.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt/groovy-rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/icons/icons.iml" filepath="$PROJECT_DIR$/platform/icons/icons.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/idea-ui/idea-ui.iml" filepath="$PROJECT_DIR$/java/idea-ui/idea-ui.iml" group="java" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/images/images.iml" filepath="$PROJECT_DIR$/plugins/images/images.iml" />
+      <module fileurl="file://$PROJECT_DIR$/images/images.iml" filepath="$PROJECT_DIR$/images/images.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/java-i18n.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/java/java-impl/java-impl.iml" filepath="$PROJECT_DIR$/java/java-impl/java-impl.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/java/java-runtime/java-runtime.iml" filepath="$PROJECT_DIR$/java/java-runtime/java-runtime.iml" group="java" />

build/scripts/layouts.gant

@@ -36,6 +36,7 @@ private List platformImplementationModules() {
           "testFramework",
           "xml",
           "lvcs-impl",
+          "images",
   ]
 }
 
@@ -146,7 +147,7 @@ def layoutFull(String home, String targetDirectory) {
     }
 
     dir("plugins") {
-      def simplePlugins = ["commander", "copyright", "properties", "java-i18n", "images", "devkit", "eclipse"]
+      def simplePlugins = ["commander", "copyright", "properties", "java-i18n", "devkit", "eclipse"]
 
       simplePlugins.each {
         layoutPlugin it

images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java

@@ -26,21 +26,22 @@ import org.intellij.images.ui.ImageComponentDecorator;
  * @see org.intellij.images.ui.ImageComponentDecorator#setTransparencyChessboardVisible
  */
 public final class ToggleTransparencyChessboardAction extends ToggleAction {
-    public boolean isSelected(AnActionEvent e) {
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        return decorator != null && decorator.isEnabledForActionPlace(e.getPlace()) && decorator.isTransparencyChessboardVisible();
-    }
+  public boolean isSelected(AnActionEvent e) {
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    return decorator != null && decorator.isEnabledForActionPlace(e.getPlace()) && decorator.isTransparencyChessboardVisible();
+  }
 
-    public void setSelected(AnActionEvent e, boolean state) {
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        if (decorator != null && decorator.isEnabledForActionPlace(e.getPlace())) {
-            decorator.setTransparencyChessboardVisible(state);
-        }
+  public void setSelected(AnActionEvent e, boolean state) {
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    if (decorator != null && decorator.isEnabledForActionPlace(e.getPlace())) {
+      decorator.setTransparencyChessboardVisible(state);
     }
+  }
 
-    public void update(final AnActionEvent e) {
-        super.update(e);
-        ImageComponentDecorator decorator = (ImageComponentDecorator) e.getDataContext().getData(ImageComponentDecorator.class.getName());
-        e.getPresentation().setEnabled(decorator != null && decorator.isEnabledForActionPlace(e.getPlace()));
-    }
+  public void update(final AnActionEvent e) {
+    super.update(e);
+    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    e.getPresentation().setEnabled(decorator != null && decorator.isEnabledForActionPlace(e.getPlace()));
+    e.getPresentation().setText(isSelected(e) ? "Hide Chessboard" : "Show Chessboard");
+  }
 }

images/src/org/intellij/images/editor/actions/ToggleGridAction.java

@@ -27,20 +27,21 @@ import org.intellij.images.editor.actionSystem.ImageEditorActionUtil;
  * @see ImageEditor#setGridVisible
  */
 public final class ToggleGridAction extends ToggleAction {
-    public boolean isSelected(AnActionEvent e) {
-        ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
-        return editor != null && editor.isGridVisible();
-    }
+  public boolean isSelected(AnActionEvent e) {
+    ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
+    return editor != null && editor.isGridVisible();
+  }
 
-    public void setSelected(AnActionEvent e, boolean state) {
-        ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
-        if (editor != null) {
-            editor.setGridVisible(state);
-        }
+  public void setSelected(AnActionEvent e, boolean state) {
+    ImageEditor editor = ImageEditorActionUtil.getValidEditor(e);
+    if (editor != null) {
+      editor.setGridVisible(state);
     }
+  }
 
-    public void update(final AnActionEvent e) {
-        super.update(e);
-        ImageEditorActionUtil.setEnabled(e);
-    }
+  public void update(final AnActionEvent e) {
+    super.update(e);
+    ImageEditorActionUtil.setEnabled(e);
+    e.getPresentation().setText(isSelected(e) ? "Hide Grid" : "Show Grid");
+  }
 }

plugins/commander/src/META-INF/plugin.xml

@@ -22,6 +22,16 @@
     <action id="CommanderSwapPanels" class="com.intellij.ide.actions.SwapPanelsAction" icon="/actions/swapPanels.png">
       <add-to-group group-id="PairFileActions" anchor="first"/>
     </action>
+
+    <group id="ImagesCommanderActions1" text="Images Commander Actions (1)">
+      <reference id="Images.EditExternaly"/>
+      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="EditSource"/>
+    </group>
+
+    <group id="ImagesCommanderActions2" text="Images Commander Actions (2)">
+      <reference id="Images.ShowThumbnails"/>
+      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="AddToFavorites"/>
+    </group>
   </actions>
 </idea-plugin>
 

plugins/images/imagesPlugin.iml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/src/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntryProperties />
-  </component>
-</module>
-

plugins/images/src/META-INF/images-commander-integration.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
-
-<idea-plugin version="2">
-  <actions>
-    <group id="ImagesCommanderActions1" text="Images Commander Actions (1)">
-      <reference id="Images.EditExternaly"/>
-      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="EditSource"/>
-    </group>
-
-    <group id="ImagesCommanderActions2" text="Images Commander Actions (2)">
-      <reference id="Images.ShowThumbnails"/>
-      <add-to-group anchor="after" group-id="CommanderPopupMenu" relative-to-action="AddToFavorites"/>
-    </group>
-  </actions>
-
-</idea-plugin>

resources/src/META-INF/IdeaPlugin.xml

@@ -1100,4 +1100,5 @@
   <xi:include href="/META-INF/XmlPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/DomPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
   <xi:include href="/META-INF/RegExpPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/ImagesPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
 </idea-plugin>

resources/src/META-INF/ImagesPlugin.xml

@@ -1,13 +1,10 @@
-<idea-plugin>
+<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <vendor>Alexey Efimov</vendor>
 
   <name>Images</name>
   <version>1.1</version>
 
-  <depends>com.intellij.modules.lang</depends>
-  <depends optional="true" config-file="images-commander-integration.xml">com.intellij.commander</depends>
-
   <resource-bundle>org.intellij.images.ImagesBundle</resource-bundle>
 
   <extensions defaultExtensionNs="com.intellij">
@@ -35,42 +32,48 @@
   <actions>
     <action class="org.intellij.images.actions.EditExternalyAction"
             id="Images.EditExternaly"
-            icon="/org/intellij/images/icons/EditExternaly.png">
+            icon="/org/intellij/images/icons/EditExternaly.png"
+            text="Open image in external editor">
       <keyboard-shortcut first-keystroke="control alt F4" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>
     </action>
     <action class="org.intellij.images.actions.ShowThumbnailsAction"
-            id="Images.ShowThumbnails">
+            id="Images.ShowThumbnails" text="Show image thumbnails">
       <keyboard-shortcut first-keystroke="shift control T" keymap="$default"/>
       <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="AddToFavorites"/>
     </action>
     <action class="org.intellij.images.actions.ToggleTransparencyChessboardAction"
             id="Images.ToggleTransparencyChessboard"
-            icon="/org/intellij/images/icons/ToggleTransparencyChessboard.png">
+            icon="/org/intellij/images/icons/ToggleTransparencyChessboard.png"
+            text="Show Chessboard">
     </action>
     <group id="Images.EditorToolbar">
       <reference id="Images.ToggleTransparencyChessboard"/>
       <action class="org.intellij.images.editor.actions.ToggleGridAction"
               id="Images.Editor.ToggleGrid"
-              icon="/org/intellij/images/icons/ToggleGrid.png">
+              icon="/org/intellij/images/icons/ToggleGrid.png"
+              text="Show Grid">
         <keyboard-shortcut first-keystroke="control QUOTE" keymap="$default"/>
       </action>
       <separator/>
       <action class="org.intellij.images.editor.actions.ZoomInAction"
               id="Images.Editor.ZoomIn"
-              icon="/org/intellij/images/icons/ZoomIn.png">
+              icon="/org/intellij/images/icons/ZoomIn.png"
+              text="Zoom In">
         <keyboard-shortcut first-keystroke="control ADD" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control EQUALS" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.ZoomOutAction"
               id="Images.Editor.ZoomOut"
-              icon="/org/intellij/images/icons/ZoomOut.png">
+              icon="/org/intellij/images/icons/ZoomOut.png"
+              text="Zoom Out">
         <keyboard-shortcut first-keystroke="control SUBTRACT" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control MINUS" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.ActualSizeAction"
               id="Images.Editor.ActualSize"
-              icon="/org/intellij/images/icons/ActualSize.png">
+              icon="/org/intellij/images/icons/ActualSize.png"
+              text="Zoom to actual size">
         <keyboard-shortcut first-keystroke="control DIVIDE" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control SLASH" keymap="$default"/>
       </action>