From f460101cbbe029332640d18a55eba2de7119e302 Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Fri, 3 Jan 2020 18:49:32 +0300
Subject: [PATCH] move image bundle + extract action texts

GitOrigin-RevId: 05d813b8b5c338635db7b1d1d8fc4fd54e2a5d4e
---
 images/resources/META-INF/ImagesPlugin.xml    | 48 +++++--------------
 .../ImagesBundle.properties                   |  0
 .../src/org/intellij/images/ImagesBundle.java |  2 +-
 .../images/options/impl/ImagesOptions.form    | 30 ++++++------
 .../src/messages/ActionsBundle.properties     | 14 ++++++
 5 files changed, 41 insertions(+), 53 deletions(-)
 rename images/resources/{org/intellij/images => messages}/ImagesBundle.properties (100%)

diff --git a/images/resources/META-INF/ImagesPlugin.xml b/images/resources/META-INF/ImagesPlugin.xml
index 47af4f9bbaa2..0512c0aff697 100644
--- a/images/resources/META-INF/ImagesPlugin.xml
+++ b/images/resources/META-INF/ImagesPlugin.xml
@@ -28,110 +28,84 @@
   </extensions>
 
   <actions>
-    <group text="Images">
+    <group id="ImagesRootGroup">
       <action class="org.intellij.images.actions.EditExternallyAction"
-              id="Images.EditExternally"
-              text="Open Image in External Editor">
+              id="Images.EditExternally">
         <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.ConvertSvgToPngAction"
-              id="Images.ConvertSvgToPng"
-              text="Convert to PNG">
+              id="Images.ConvertSvgToPng">
         <add-to-group anchor="after" group-id="ProjectViewPopupMenu" relative-to-action="EditSource"/>
       </action>
       <action class="org.intellij.images.actions.ShowThumbnailsAction"
-              id="Images.ShowThumbnails" text="Show Image Thumbnails">
+              id="Images.ShowThumbnails">
       </action>
       <action class="org.intellij.images.actions.ToggleTransparencyChessboardAction"
               id="Images.ToggleTransparencyChessboard"
-              icon="ImagesIcons.ToggleTransparencyChessboard"
-              text="Show Chessboard"
-              description="Show a chessboard on transparent image parts">
+              icon="ImagesIcons.ToggleTransparencyChessboard">
       </action>
       <action class="org.intellij.images.editor.actions.SetBackgroundImageAction"
-              id="Images.SetBackgroundImage"
-              text="Set Background Image">
+              id="Images.SetBackgroundImage">
         <add-to-group group-id="ProjectViewPopupMenu"/>
         <add-to-group group-id="EditorPopupMenu3"/>
       </action>
       <action class="org.intellij.images.editor.actions.ToggleGridAction"
               id="Images.Editor.ToggleGrid"
-              icon="AllIcons.Graph.Grid"
-              text="Show Grid">
+              icon="AllIcons.Graph.Grid">
         <keyboard-shortcut first-keystroke="control QUOTE" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.ZoomInAction"
               id="Images.Editor.ZoomIn"
               icon="AllIcons.Graph.ZoomIn"
-              text="Zoom In"
               use-shortcut-of="ExpandAll"/>
       <action class="org.intellij.images.editor.actions.ZoomOutAction"
               id="Images.Editor.ZoomOut"
               icon="AllIcons.Graph.ZoomOut"
-              text="Zoom Out"
               use-shortcut-of="CollapseAll"/>
       <action class="org.intellij.images.editor.actions.ActualSizeAction"
               id="Images.Editor.ActualSize"
-              icon="AllIcons.Graph.ActualZoom"
-              text="Zoom to Actual Size">
+              icon="AllIcons.Graph.ActualZoom">
         <keyboard-shortcut first-keystroke="control DIVIDE" keymap="$default"/>
         <keyboard-shortcut first-keystroke="control SLASH" keymap="$default"/>
       </action>
       <action class="org.intellij.images.editor.actions.FitZoomToWindowAction"
               id="Images.Editor.FitZoomToWindow"
-              icon="AllIcons.Graph.FitContent"
-              text="Fit Zoom to Window"/>
+              icon="AllIcons.Graph.FitContent"/>
       <separator/>
 
       <action class="org.intellij.images.thumbnail.actions.UpFolderAction"
               id="Images.Thumbnails.UpFolder"
-              text="Parent Folder"
-              description="Show image thumbnails from the containing folder"
               icon="AllIcons.Nodes.UpFolder">
         <keyboard-shortcut first-keystroke="BACK_SPACE" keymap="$default"/>
       </action>
       <action class="org.intellij.images.thumbnail.actions.ToggleRecursiveAction"
               id="Images.Thumbnails.ToggleRecursive"
-              text="Recursive"
-              description="Toggle whether to show the images from subfolders recursively"
               icon="AllIcons.ObjectBrowser.FlattenPackages">
         <keyboard-shortcut first-keystroke="alt MULTIPLY" keymap="$default"/>
       </action>
       <action class="org.intellij.images.thumbnail.actions.ToggleFileSizeAction"
               id="Images.Thumbnails.ToggleFileSize"
-              text="File Size"
-              description="Toggle whether to show the image size information"
               icon="AllIcons.FileTypes.Any_type">
       </action>
       <action class="org.intellij.images.thumbnail.actions.ToggleFileNameAction"
               id="Images.Thumbnails.ToggleFileName"
-              text="File Name"
-              description="Toggle whether to show the image name"
               icon="AllIcons.Actions.ShowImportStatements">
       </action>
       <action class="org.intellij.images.thumbnail.actions.FilterByThemeComboBoxAction"
               internal="true"
-              id="Images.Thumbnails.FilterByTheme"
-              text="Filter by Theme"
-              description="Filter images by theme"/>
+              id="Images.Thumbnails.FilterByTheme"/>
       <action class="org.intellij.images.thumbnail.actions.FilterByTagActionGroup"
               internal="true"
               popup="true"
-              id="Images.Thumbnails.FilterByTag"
-              text="Filter by Tag"
-              description="Filter images by tag"/>
+              id="Images.Thumbnails.FilterByTag"/>
       <action class="org.intellij.images.thumbnail.actions.ToggleTagsPanelAction"
               id="Images.Thumbnails.ToggleTagsPanelName"
-              text="Preview Tags"
-              description="Toggle whether to show the tags management panel"
               icon="AllIcons.Actions.Preview">
       </action>
 
       <action class="org.intellij.images.thumbnail.actions.HideThumbnailsAction"
               id="Images.Thumbnails.Hide"
-              text="Hide"
-              description="Hide image thumbnails"
               icon="AllIcons.Actions.Cancel" use-shortcut-of="CloseContent"/>
 
       <action class="org.intellij.images.thumbnail.actions.EnterAction"
diff --git a/images/resources/org/intellij/images/ImagesBundle.properties b/images/resources/messages/ImagesBundle.properties
similarity index 100%
rename from images/resources/org/intellij/images/ImagesBundle.properties
rename to images/resources/messages/ImagesBundle.properties
diff --git a/images/src/org/intellij/images/ImagesBundle.java b/images/src/org/intellij/images/ImagesBundle.java
index 149ba9a8cb51..8ed070e17b32 100644
--- a/images/src/org/intellij/images/ImagesBundle.java
+++ b/images/src/org/intellij/images/ImagesBundle.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class ImagesBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "org.intellij.images.ImagesBundle";
+  @NonNls private static final String BUNDLE = "messages.ImagesBundle";
   private static final ImagesBundle INSTANCE = new ImagesBundle();
 
   private ImagesBundle() { super(BUNDLE); }
diff --git a/images/src/org/intellij/images/options/impl/ImagesOptions.form b/images/src/org/intellij/images/options/impl/ImagesOptions.form
index 6f190d9a347b..0433c896f24f 100644
--- a/images/src/org/intellij/images/options/impl/ImagesOptions.form
+++ b/images/src/org/intellij/images/options/impl/ImagesOptions.form
@@ -17,7 +17,7 @@
           <enabled value="true"/>
           <visible value="true"/>
         </properties>
-        <border type="none" title-resource-bundle="org/intellij/images/ImagesBundle" title-key="main.page.border.title"/>
+        <border type="none" title-resource-bundle="messages/ImagesBundle" title-key="main.page.border.title"/>
 <clientProperties>
   <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
 </clientProperties>
@@ -27,7 +27,7 @@
               <grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="settings.preffered.smart.zoom.width"/>
+              <text resource-bundle="messages/ImagesBundle" key="settings.preffered.smart.zoom.width"/>
             </properties>
           </component>
           <component id="e096e" class="javax.swing.JLabel" binding="smartZoomingHeightLabel">
@@ -35,7 +35,7 @@
               <grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="settings.preffered.smart.zoom.height"/>
+              <text resource-bundle="messages/ImagesBundle" key="settings.preffered.smart.zoom.height"/>
             </properties>
           </component>
           <component id="5d722" class="javax.swing.JCheckBox" binding="showGrid">
@@ -43,7 +43,7 @@
               <grid row="0" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="show.grid.lines"/>
+              <text resource-bundle="messages/ImagesBundle" key="show.grid.lines"/>
             </properties>
           </component>
           <component id="8092" class="javax.swing.JCheckBox" binding="showChessboard">
@@ -51,7 +51,7 @@
               <grid row="4" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="show.transparency.chessboard"/>
+              <text resource-bundle="messages/ImagesBundle" key="show.transparency.chessboard"/>
             </properties>
           </component>
           <component id="1d481" class="javax.swing.JCheckBox" binding="wheelZooming">
@@ -59,7 +59,7 @@
               <grid row="8" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="enable.mousewheel.zooming"/>
+              <text resource-bundle="messages/ImagesBundle" key="enable.mousewheel.zooming"/>
             </properties>
           </component>
           <component id="135b7" class="javax.swing.JCheckBox" binding="smartZooming">
@@ -67,7 +67,7 @@
               <grid row="9" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="smart.zoom"/>
+              <text resource-bundle="messages/ImagesBundle" key="smart.zoom"/>
             </properties>
           </component>
           <component id="f13" class="javax.swing.JLabel" binding="chessboardSizeLabel">
@@ -75,7 +75,7 @@
               <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="chessboard.cell.size"/>
+              <text resource-bundle="messages/ImagesBundle" key="chessboard.cell.size"/>
             </properties>
           </component>
           <component id="3c25" class="javax.swing.JSpinner" binding="chessboardSize">
@@ -101,7 +101,7 @@
               <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="show.grid.every"/>
+              <text resource-bundle="messages/ImagesBundle" key="show.grid.every"/>
             </properties>
           </component>
           <component id="e4680" class="javax.swing.JSpinner" binding="gridLineSpan">
@@ -115,7 +115,7 @@
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="show.grid.zoom.limit"/>
+              <text resource-bundle="messages/ImagesBundle" key="show.grid.zoom.limit"/>
             </properties>
           </component>
           <component id="ec3c4" class="javax.swing.JSpinner" binding="gridLineZoomFactor">
@@ -145,7 +145,7 @@
               <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="white.cell.color"/>
+              <text resource-bundle="messages/ImagesBundle" key="white.cell.color"/>
             </properties>
           </component>
           <component id="5a0c4" class="javax.swing.JLabel" binding="chessboardBlackColorLabel">
@@ -153,7 +153,7 @@
               <grid row="7" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="black.cell.color"/>
+              <text resource-bundle="messages/ImagesBundle" key="black.cell.color"/>
             </properties>
           </component>
           <component id="b2df3" class="com.intellij.ui.ColorPanel" binding="chessboardWhiteColor">
@@ -173,7 +173,7 @@
               <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="grid.line.color"/>
+              <text resource-bundle="messages/ImagesBundle" key="grid.line.color"/>
             </properties>
           </component>
           <component id="61a7d" class="com.intellij.ui.ColorPanel" binding="gridLineColor">
@@ -200,7 +200,7 @@
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="none" title-resource-bundle="org/intellij/images/ImagesBundle" title-key="external.editor.border.title"/>
+        <border type="none" title-resource-bundle="messages/ImagesBundle" title-key="external.editor.border.title"/>
 <clientProperties>
   <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
 </clientProperties>
@@ -210,7 +210,7 @@
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="org/intellij/images/ImagesBundle" key="external.editor.executable.path"/>
+              <text resource-bundle="messages/ImagesBundle" key="external.editor.executable.path"/>
             </properties>
           </component>
           <component id="8e176" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="externalEditorPath">
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index e095bd5977a4..6e081dd34f3a 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -1757,6 +1757,20 @@ action.Images.Thumbnails.Hide.text=Close thumbnails
 action.Images.Thumbnails.Hide.description=Close thumbnails window
 action.Images.ShowThumbnails.text=Show Image Thumbnails
 action.Images.ShowThumbnails.description=Show thumbnails view for current directory
+action.Images.Thumbnails.ToggleTagsPanelName.text=Preview Tags
+action.Images.Thumbnails.ToggleTagsPanelName.description=Toggle whether to show the tags management panel
+action.Images.Thumbnails.FilterByTag.text=Filter by Tag
+action.Images.Thumbnails.FilterByTag.description=Filter images by tag
+action.Images.Thumbnails.FilterByTheme.text=Filter by Theme
+action.Images.Thumbnails.FilterByTheme.description=Filter images by theme
+action.Images.Thumbnails.ToggleFileName.text=File Name
+action.Images.Thumbnails.ToggleFileName.description=Toggle whether to show the image name
+action.Images.Thumbnails.ToggleFileSize.text=File Size
+action.Images.Thumbnails.ToggleFileSize.description=Toggle whether to show the image size information
+action.Images.Editor.FitZoomToWindow.text=Fit Zoom to Window
+action.Images.SetBackgroundImage.text=Set Background Image
+action.Images.ConvertSvgToPng.text=Convert to PNG
+group.ImagesRootGroup.text=Images
 
 action.TabList.text=Show Hidden Tabs
 action.TabList.description=Show dropdown with the list of tabs that don't fit on the screen in single-row tab layout