add reset function and update changeNotes

liying2008 · liying2008 · commit caa934449f1f · 2020-05-31T23:18:04.000+08:00
diff --git a/changeNotes.html b/changeNotes.html
@@ -1,3 +1,9 @@
+<h3>v1.0.2</h3><br>
+<li>Add plugin icon.</li>
+<li>Add settings reset function.</li>
+<li>Fix one bug.</li>
+<br>
+
 <h3>v1.0.1</h3><br>
 <li>Fixed a bug where the plugin was not available on version 2020.1.</li>
 <br>
diff --git a/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt b/src/main/java/cc/duduhuo/git/conflict/setting/ColorSettingsPanelImpl.kt
@@ -254,7 +254,10 @@ class ColorSettingsPanelImpl : ColorSettingsPanel() {
         }
     }
 
-    override fun reset() {}
+    override fun reset() {
+        cbColorScheme.selectedItem = mSchemeName
+    }
+
     override fun apply() {
         val isModified = isModified
         val persistentState = GlobalSettings.getPersistentState()

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,10 @@ class ColorSettingsPanelImpl : ColorSettingsPanel() {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
`257`		`- override fun reset() {}`
	`257`	`+ override fun reset() {`
	`258`	`+ cbColorScheme.selectedItem = mSchemeName`
	`259`	`+ }`
	`260`	`+`
`258`	`261`	`override fun apply() {`
`259`	`262`	`val isModified = isModified`
`260`	`263`	`val persistentState = GlobalSettings.getPersistentState()`