.idea/workspace.xml in eric_weixin-0.0.5 vs .idea/workspace.xml in eric_weixin-0.0.6

- old
+ new

@@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> <list default="true" id="825e533a-b0a1-462f-abd1-eefea8ff703f" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/version.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/version.rb" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/eric_weixin.rb" afterPath="$PROJECT_DIR$/lib/eric_weixin.rb" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="eric_weixin.iws" /> <ignored path=".idea/workspace.xml" /> <option name="TRACKING_ENABLED" value="true" /> @@ -28,90 +24,40 @@ <component name="FavoritesManager"> <favorites_list name="eric_weixin" /> </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="weixin_controller.rb" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="558" max-vertical-offset="774"> - <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="weixin_user.rb" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="1710"> - <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="public_account.rb" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="21" max-vertical-offset="3438"> - <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="eric_weixin.gemspec" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="eric_weixin.gemspec" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.48441926" vertical-offset="0" max-vertical-offset="706"> - <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="684"> + <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="version.rb" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="version.rb" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162"> + <state vertical-scroll-proportion="0.02549575" vertical-offset="0" max-vertical-offset="706"> <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> <folding /> </state> </provider> </entry> </file> <file leaf-file-name="eric_weixin.rb" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450"> - <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" /> + <state vertical-scroll-proportion="0.0" vertical-offset="279" max-vertical-offset="972"> + <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Gemfile"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="180"> - <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="aa.erb" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="18" max-vertical-offset="126"> - <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> <FindUsagesManager> <setting name="OPEN_NEW_TAB" value="true" /> @@ -132,18 +78,18 @@ <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/news.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/article.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/article_news.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/base_controller.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/weixin/aa.erb" /> - <option value="$PROJECT_DIR$/eric_weixin.gemspec" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/big_application_controller.rb" /> - <option value="$PROJECT_DIR$/lib/eric_weixin.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/reply_message_rule.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/views/eric_weixin/weixin/aa.erb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/public_account.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/app/model/weixin_user.rb" /> + <option value="$PROJECT_DIR$/eric_weixin.gemspec" /> + <option value="$PROJECT_DIR$/lib/eric_weixin.rb" /> <option value="$PROJECT_DIR$/lib/eric_weixin/version.rb" /> </list> </option> </component> <component name="ProjectFrameBounds"> @@ -439,31 +385,31 @@ <updated>1430705513351</updated> </task> <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="23" width="1440" height="829" extended-state="6" /> + <frame x="0" y="23" width="1440" height="829" extended-state="0" /> <editor active="true" /> <layout> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24821173" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25178826" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" 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" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42098093" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> </layout> </component> <component name="Vcs.Log.UiProperties"> <option name="RECENTLY_FILTERED_USER_GROUPS"> <collection /> @@ -482,10 +428,18 @@ </component> <component name="XDebuggerManager"> <breakpoint-manager /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="504" max-vertical-offset="684"> + <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/lib/eric_weixin/app/controllers/weixin/weixin_controller.rb"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="774"> <caret line="31" column="7" selection-start-line="31" selection-start-column="7" selection-end-line="31" selection-end-column="7" /> <folding /> @@ -732,18 +686,18 @@ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/LICENSE.txt"> - <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider"> - <state /> - </provider> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="680"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> </state> </provider> + <provider editor-type-id="com.intellij.persistence.database.editor.CsvTableFileEditorProvider"> + <state /> + </provider> </entry> <entry file="file://$PROJECT_DIR$/Rakefile"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="144"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> @@ -838,29 +792,29 @@ <caret line="40" column="8" selection-start-line="40" selection-start-column="8" selection-end-line="40" selection-end-column="8" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb"> + <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="162"> - <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="684"> + <caret line="28" column="68" selection-start-line="28" selection-start-column="68" selection-end-line="28" selection-end-column="68" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/lib/eric_weixin.rb"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="450"> - <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" /> + <state vertical-scroll-proportion="0.0" vertical-offset="279" max-vertical-offset="972"> + <caret line="18" column="2" selection-start-line="18" selection-start-column="2" selection-end-line="18" selection-end-column="2" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/eric_weixin.gemspec"> + <entry file="file://$PROJECT_DIR$/lib/eric_weixin/version.rb"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.48441926" vertical-offset="0" max-vertical-offset="706"> - <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + <state vertical-scroll-proportion="0.02549575" vertical-offset="0" max-vertical-offset="706"> + <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> <folding /> </state> </provider> </entry> </component>