lachlankrautz · GB756980 · Aug 9, 2018 · Oct 18, 2018 · Oct 18, 2018 · Oct 18, 2018
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,4 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
+/.idea/*
diff --git a/README.md b/README.md
@@ -1,26 +1,31 @@
-# Background Image Plus
+# Background Image Plus +
 Set background random background images in Intellij editor.
 
-![Alt text](https://github.com/lachlankrautz/backgroundImagePlus/blob/master/resources/screenshots/example.png?raw=true "Title")
+![Alt text](./resources/screenshots/example.png?raw=true "Title")
 
 ### Settings
 
 Settings -> Appearance & Behaviour -> Background Image Plus  
 - Backgrounds: folder (recursive) to pull random background images from
-- Change every: Set interval to change background every x minutes
+- Change every: Set interval to change background every x seconds/minutes/hours/days
+- Change mode: Set environment for change （if choose "both", then "Keep same image" will keep same image in both environments）
 
-![Alt text](https://github.com/lachlankrautz/backgroundImagePlus/blob/master/resources/screenshots/settings.png?raw=true "Title")
+![Alt text](./resources/screenshots/settings.png?raw=true "Title")
 
 ### Menu Items
 
 View: 
-- Set Background Image
+- Set Background Image (set image properties : opacity/fill/anchor/flip ...)
 - Random Background Image
+- Random Order Reset (regenerate a new round of image order based on the last file path)
 - Clear Background Image (cancels "change every" interval)
 
+![Alt text](./resources/screenshots/actions.png?raw=true "Title")
+
 ### Usage
 
 - Set backgrounds folder
 - Optionally set "change every" interval
 - Optionally bind "Random Background Image" action to a hotkey
+- Optionally bind "Random Order Reset" action to a hotkey
 - Cycle background images while procrastinating
diff --git a/backgroundImagePlus.iml b/backgroundImagePlus.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PLUGIN_MODULE" version="4">
+  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,17 +1,55 @@
 <idea-plugin>
-    <id>co.notime.intellijPlugin.backgroundImagePlus</id>
-    <name>Background Image Plus</name>
-    <version>1.2.1</version>
-    <vendor email="lachlan.krautz@gmail.com" url="http://github.com/lachlankrautz">Lachlan Krautz</vendor>
+    <id>com.notime.intellijPlugin.backgroundImagePlus</id>
+    <name>Background Image Plus +</name>
+    <version>1.0.3</version>
+    <vendor email="332643212@qq.com" url="https://github.com/HNUHell/backgroundImagePlus">
+        HNUHell
+    </vendor>
 
     <description><![CDATA[
       Set the editor background to a random picture from a folder.<br>
+      Forked from https://github.com/lachlankrautz/backgroundImagePlus.<br>
+      But optimized for change function.<br>
+      reference fork:<br>
+            https://github.com/godfather1103/backgroundImagePlus<br>
+            https://github.com/zhanglanzhu521/backgroundImagePlus<br>
     ]]></description>
 
-    <change-notes><![CDATA[
-      Added settings page<br>
-      Added menu items
-    ]]>
+    <change-notes>
+        <![CDATA[<html>
+        <h3>1.0.3</h3>
+        <ul>
+          <li>适配IDEA 2020版本（移除View菜单下Set Background Image功能）。  Adapt to idea 2020（Remove the "Set Background Image" function from the "View" menu）.</li>
+          <li>合并插件菜单。  Action to group.</li>
+          <li>优化”洗牌“功能，启动自动切换。  Improve reshuffle function to start auto switch.</li>
+          <li>其它描述信息调整。   Other description information adjustment.</li>
+        </ul>
+        <h3>1.0.2</h3>
+        <ul>
+          <li>修正定时任务运行场景（当在它的settings窗口时定时任务不再运行）。  Correct timing task runtime environment(Timed tasks are no longer running when in it's settings window).</li>
+        </ul>
+        <h3>1.0.1-dev</h3>
+        <ul>
+          <li>改变随机模式（之前为每次随机取一张，现在为将所有图片进行“洗牌”，然后一一取出，取完一轮或者改变文件目录后重新“洗牌”）。  Change the random mode(Previously, each time we randomly take one, now all the images are "shuffled" , then take them out one by one, and then "shuffle" after finishing a round or changing the file directory).</li>
+          <li>支持重新“洗牌”。  Support reshuffle.（View | Random Order Reset）</li>
+        </ul>
+        <h3>1.0</h3>
+        <ul>
+          <li>删除不透明度设置（原生支持，不需要增加此功能。见"File | Settings | Appearance & Behavior | Appearance | BACKGROUND IMAGE..."）。  Delete opacity settings(Native support，no need for this settings. See "File | Settings | Appearance & Behavior | Appearance | BACKGROUND IMAGE...").</li>
+          <li>支持变化模式设置。  Add Change mode settings.</li>
+        </ul>
+        <h3>0.9</h3>
+        <ul>
+          <li>修复自动变化的功能。   Fix automatic changes.</li>
+          <li>支持时间多样性。  Support time diversity.</li>
+          <li>支持不透明度设置。  Support opacity settings</li>
+        </ul>
+        <h3>v1.2.1 (Old versions from https://github.com/lachlankrautz/backgroundImagePlus)</h3>
+        <ul>
+          <li>增加设置页。  Added settings page.</li>
+          <li>增加目录项。  Added menu items.</li>
+        </ul>
+        </html>]]>
     </change-notes>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
@@ -26,19 +64,26 @@
     <extensions defaultExtensionNs="com.intellij">
         <applicationConfigurable groupId="appearance" groupWeight="20" id="background.image.plus"
                                  displayName="Background Image Plus"
-                                 instance="co.notime.intellijPlugin.backgroundImagePlus.ui.Settings"/>
+                                 instance="com.notime.intellijPlugin.backgroundImagePlus.ui.Settings"/>
     </extensions>
 
     <actions>
-        <group id="backgroundImagePlus" text="Background Image Plus" description="Background Image Plus">
-            <add-to-group group-id="ViewMenu" anchor="before" relative-to-action="ToggleFullScreenGroup"/>
-            <separator/>
-            <action id="setBackgroundImage" class="org.intellij.images.editor.actions.SetBackgroundImageAction"
-                    text="Set Background Image"/>
-            <action id="randomBackgroundImage" class="co.notime.intellijPlugin.backgroundImagePlus.action.RandomBackground"
-                    text="Random Background Image"/>
-            <action id="clearBackgroundImage" class="co.notime.intellijPlugin.backgroundImagePlus.action.ClearBackground"
-                    text="Clear Background Image"/>
+        <action id="randomBackgroundImage"
+                class="com.notime.intellijPlugin.backgroundImagePlus.action.RandomBackground"
+                text="Random Background Image">
+        </action>
+        <action id="randomOrderReset" class="com.notime.intellijPlugin.backgroundImagePlus.action.RandomOrderReset"
+                text="Random Order Reset">
+        </action>
+        <action id="clearBackgroundImage"
+                class="com.notime.intellijPlugin.backgroundImagePlus.action.ClearBackground"
+                text="Clear Background Image">
+        </action>
+        <group id="backgroundImagePlus" text="Background Image Plus" description="Background Image Plus" popup="true">
+            <reference ref="randomBackgroundImage"/>
+            <reference ref="randomOrderReset"/>
+            <reference ref="clearBackgroundImage"/>
+            <add-to-group group-id="ViewMenu" anchor="last"/>
         </group>
     </actions>
 

diff --git a/resources/screenshots/actions.png b/resources/screenshots/actions.png
diff --git a/resources/screenshots/attributes.png b/resources/screenshots/attributes.png
diff --git a/resources/screenshots/example.png b/resources/screenshots/example.png
diff --git a/resources/screenshots/settings.png b/resources/screenshots/settings.png
diff --git a/src/co/notime/intellijPlugin/backgroundImagePlus/BackgroundService.java b/src/co/notime/intellijPlugin/backgroundImagePlus/BackgroundService.java
diff --git a/src/co/notime/intellijPlugin/backgroundImagePlus/RandomBackgroundTask.java b/src/co/notime/intellijPlugin/backgroundImagePlus/RandomBackgroundTask.java
diff --git a/src/co/notime/intellijPlugin/backgroundImagePlus/ui/Settings.form b/src/co/notime/intellijPlugin/backgroundImagePlus/ui/Settings.form