Forráskód Böngészése

fix change state for configuration

ruki 7 éve
szülő
commit
8d68dea7df
2 módosított fájl, 41 hozzáadás és 34 törlés
  1. 31 19
      .idea/workspace.xml
  2. 10 15
      src/org/tboox/xmake/project/XMakeProjectConfigurable.kt

+ 31 - 19
.idea/workspace.xml

@@ -38,11 +38,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="XMakeConfiguration.kt" pinned="false" current-in-tab="true">
+      <file leaf-file-name="XMakeConfiguration.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/shared/XMakeConfiguration.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="448">
-              <caret line="158" column="13" lean-forward="true" selection-start-line="158" selection-start-column="13" selection-end-line="158" selection-end-column="13" />
+            <state relative-caret-position="461">
+              <caret line="159" column="0" lean-forward="false" selection-start-line="159" selection-start-column="0" selection-end-line="159" selection-end-column="0" />
               <folding>
                 <element signature="e#32#460#0" expanded="true" />
               </folding>
@@ -74,6 +74,18 @@
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="XMakeProjectConfigurable.kt" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfigurable.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="360">
+              <caret line="263" column="45" lean-forward="false" selection-start-line="263" selection-start-column="45" selection-end-line="263" selection-end-column="45" />
+              <folding>
+                <element signature="e#33#1481#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="XMakeRunner.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/run/XMakeRunner.kt">
           <provider selected="true" editor-type-id="text-editor">
@@ -198,13 +210,11 @@
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfiguration.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectSettingsService.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectSettingsServiceImpl.kt" />
-        <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfigurable.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/utils/ExternalToolRunner.java" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/utils/TerminalExecutionConsole.java" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeToolWindow.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeToolWindowPanel.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeToolWindowFactory.kt" />
-        <option value="$PROJECT_DIR$/src/org/tboox/xmake/shared/XMakeConfiguration.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/actions/CleanConfigurationAction.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/actions/QuickStartAction.kt" />
         <option value="$PROJECT_DIR$/resources/META-INF/plugin.xml" />
@@ -220,6 +230,8 @@
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeToolWindowProblemPanel.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/run/XMakeRunState.kt" />
         <option value="$PROJECT_DIR$/src/org/tboox/xmake/run/XMakeRunConfiguration.kt" />
+        <option value="$PROJECT_DIR$/src/org/tboox/xmake/shared/XMakeConfiguration.kt" />
+        <option value="$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfigurable.kt" />
       </list>
     </option>
   </component>
@@ -491,7 +503,7 @@
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32907802" sideWeight="0.5062696" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32907802" sideWeight="0.4937304" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32907802" sideWeight="0.4937304" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -656,7 +668,7 @@
         <state relative-caret-position="245">
           <caret line="19" column="66" lean-forward="false" selection-start-line="19" selection-start-column="66" selection-end-line="19" selection-end-column="66" />
           <folding>
-            <element signature="e#33#307#0" expanded="true" />
+            <element signature="e#33#307#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -736,16 +748,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfigurable.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1260">
-          <caret line="119" column="9" lean-forward="false" selection-start-line="113" selection-start-column="0" selection-end-line="119" selection-end-column="9" />
-          <folding>
-            <element signature="e#33#1481#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeToolWindowProblemPanel.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="523">
@@ -868,14 +870,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/shared/XMakeConfiguration.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="158" column="13" lean-forward="true" selection-start-line="158" selection-start-column="13" selection-end-line="158" selection-end-column="13" />
+        <state relative-caret-position="461">
+          <caret line="159" column="0" lean-forward="false" selection-start-line="159" selection-start-column="0" selection-end-line="159" selection-end-column="0" />
           <folding>
             <element signature="e#32#460#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/org/tboox/xmake/project/XMakeProjectConfigurable.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="360">
+          <caret line="263" column="45" lean-forward="false" selection-start-line="263" selection-start-column="45" selection-end-line="263" selection-end-column="45" />
+          <folding>
+            <element signature="e#33#1481#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 10 - 15
src/org/tboox/xmake/project/XMakeProjectConfigurable.kt

@@ -253,22 +253,17 @@ class XMakeProjectConfigurable(
 
     override fun isModified(): Boolean {
 
-        if (xmakeConfiguration.data.currentPlatform != platformsModels.selectedItem.toString())
-            return true
-        if (xmakeConfiguration.data.currentArchitecture != architecturesModels.selectedItem.toString())
-            return true
-        if (xmakeConfiguration.data.currentMode != modesModels.selectedItem.toString())
-            return true
-        if (xmakeConfiguration.data.additionalConfiguration != additionalConfiguration.text)
-            return true
-        if (xmakeConfiguration.data.workingDirectory != workingDirectory.component.text)
-            return true
-        if (xmakeConfiguration.data.buildOutputDirectory != buildOutputDirectory.component.text)
-            return true
-        if (xmakeConfiguration.data.androidNDKDirectory != androidNDKDirectory.component.text)
-            return true
-        if (xmakeConfiguration.data.verboseOutput != verboseOutput.isSelected)
+        if (xmakeConfiguration.data.currentPlatform != platformsModels.selectedItem.toString() ||
+            xmakeConfiguration.data.currentArchitecture != architecturesModels.selectedItem.toString() ||
+            xmakeConfiguration.data.currentMode != modesModels.selectedItem.toString() ||
+            xmakeConfiguration.data.additionalConfiguration != additionalConfiguration.text ||
+            xmakeConfiguration.data.workingDirectory != workingDirectory.component.text ||
+            xmakeConfiguration.data.buildOutputDirectory != buildOutputDirectory.component.text ||
+            xmakeConfiguration.data.androidNDKDirectory != androidNDKDirectory.component.text ||
+            xmakeConfiguration.data.verboseOutput != verboseOutput.isSelected) {
+            xmakeConfiguration.changed = true
             return true
+        }
         return false
     }