|
@@ -69,10 +69,21 @@ |
69 |
69 |
|
</component> |
70 |
70 |
|
<component name="FileEditorManager"> |
71 |
71 |
|
<leaf> |
72 |
|
- |
<file leaf-file-name="MyActivity.java" pinned="false" current="true" current-in-tab="true"> |
|
72 |
+ |
<file leaf-file-name="MyActivity.java" pinned="false" current="false" current-in-tab="false"> |
73 |
73 |
|
<entry file="file://$PROJECT_DIR$/src/com/example/MyActivity.java"> |
74 |
74 |
|
<provider selected="true" editor-type-id="text-editor"> |
75 |
|
- |
<state line="2" column="33" selection-start="50" selection-end="50" vertical-scroll-proportion="0.058939096"> |
|
75 |
+ |
<state line="3" column="83" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0"> |
|
76 |
+ |
<folding> |
|
77 |
+ |
<element signature="imports" expanded="true" /> |
|
78 |
+ |
</folding> |
|
79 |
+ |
</state> |
|
80 |
+ |
</provider> |
|
81 |
+ |
</entry> |
|
82 |
+ |
</file> |
|
83 |
+ |
<file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true"> |
|
84 |
+ |
<entry file="file://$PROJECT_DIR$/assets/www/index.html"> |
|
85 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
|
86 |
+ |
<state line="11" column="42" selection-start="189" selection-end="189" vertical-scroll-proportion="0.10796767"> |
76 |
87 |
|
<folding /> |
77 |
88 |
|
</state> |
78 |
89 |
|
</provider> |
|
@@ -98,14 +109,15 @@ |
98 |
109 |
|
<option name="changedFiles"> |
99 |
110 |
|
<list> |
100 |
111 |
|
<option value="$PROJECT_DIR$/src/com/example/MyActivity.java" /> |
|
112 |
+ |
<option value="$PROJECT_DIR$/assets/www/index.html" /> |
101 |
113 |
|
</list> |
102 |
114 |
|
</option> |
103 |
115 |
|
</component> |
104 |
116 |
|
<component name="ProjectFrameBounds"> |
105 |
|
- |
<option name="x" value="1999" /> |
106 |
|
- |
<option name="y" value="-314" /> |
107 |
|
- |
<option name="width" value="1975" /> |
108 |
|
- |
<option name="height" value="897" /> |
|
117 |
+ |
<option name="x" value="2796" /> |
|
118 |
+ |
<option name="y" value="-361" /> |
|
119 |
+ |
<option name="width" value="1208" /> |
|
120 |
+ |
<option name="height" value="1928" /> |
109 |
121 |
|
</component> |
110 |
122 |
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
111 |
123 |
|
<OptionsSetting value="true" id="Add" /> |
|
@@ -114,11 +126,13 @@ |
114 |
126 |
|
<OptionsSetting value="true" id="Update" /> |
115 |
127 |
|
<OptionsSetting value="true" id="Status" /> |
116 |
128 |
|
<OptionsSetting value="true" id="Edit" /> |
|
129 |
+ |
<OptionsSetting value="true" id="Undo Check Out" /> |
|
130 |
+ |
<OptionsSetting value="true" id="Get Latest Version" /> |
117 |
131 |
|
<ConfirmationsSetting value="0" id="Add" /> |
118 |
132 |
|
<ConfirmationsSetting value="0" id="Remove" /> |
119 |
133 |
|
</component> |
120 |
134 |
|
<component name="ProjectReloadState"> |
121 |
|
- |
<option name="STATE" value="0" /> |
|
135 |
+ |
<option name="STATE" value="2" /> |
122 |
136 |
|
</component> |
123 |
137 |
|
<component name="ProjectView"> |
124 |
138 |
|
<navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5"> |
|
@@ -133,6 +147,24 @@ |
133 |
147 |
|
<sortByType /> |
134 |
148 |
|
</navigator> |
135 |
149 |
|
<panes> |
|
150 |
+ |
<pane id="PackagesPane"> |
|
151 |
+ |
<subPane> |
|
152 |
+ |
<PATH> |
|
153 |
+ |
<PATH_ELEMENT> |
|
154 |
+ |
<option name="myItemId" value="PhonegapHelloWorld" /> |
|
155 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> |
|
156 |
+ |
</PATH_ELEMENT> |
|
157 |
+ |
<PATH_ELEMENT> |
|
158 |
+ |
<option name="myItemId" value="PhonegapHelloWorld" /> |
|
159 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> |
|
160 |
+ |
</PATH_ELEMENT> |
|
161 |
+ |
<PATH_ELEMENT> |
|
162 |
+ |
<option name="myItemId" value="Libraries" /> |
|
163 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> |
|
164 |
+ |
</PATH_ELEMENT> |
|
165 |
+ |
</PATH> |
|
166 |
+ |
</subPane> |
|
167 |
+ |
</pane> |
136 |
168 |
|
<pane id="Scope"> |
137 |
169 |
|
<subPane subId="Project Files"> |
138 |
170 |
|
<PATH> |
|
@@ -179,22 +211,40 @@ |
179 |
211 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
180 |
212 |
|
</PATH_ELEMENT> |
181 |
213 |
|
</PATH> |
182 |
|
- |
</subPane> |
183 |
|
- |
</pane> |
184 |
|
- |
<pane id="PackagesPane"> |
185 |
|
- |
<subPane> |
186 |
214 |
|
<PATH> |
187 |
215 |
|
<PATH_ELEMENT> |
188 |
216 |
|
<option name="myItemId" value="PhonegapHelloWorld" /> |
189 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> |
|
217 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
190 |
218 |
|
</PATH_ELEMENT> |
191 |
219 |
|
<PATH_ELEMENT> |
192 |
220 |
|
<option name="myItemId" value="PhonegapHelloWorld" /> |
193 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> |
|
221 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
194 |
222 |
|
</PATH_ELEMENT> |
195 |
223 |
|
<PATH_ELEMENT> |
196 |
|
- |
<option name="myItemId" value="Libraries" /> |
197 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" /> |
|
224 |
+ |
<option name="myItemId" value="gen" /> |
|
225 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
|
226 |
+ |
</PATH_ELEMENT> |
|
227 |
+ |
<PATH_ELEMENT> |
|
228 |
+ |
<option name="myItemId" value="example" /> |
|
229 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
|
230 |
+ |
</PATH_ELEMENT> |
|
231 |
+ |
</PATH> |
|
232 |
+ |
<PATH> |
|
233 |
+ |
<PATH_ELEMENT> |
|
234 |
+ |
<option name="myItemId" value="PhonegapHelloWorld" /> |
|
235 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
|
236 |
+ |
</PATH_ELEMENT> |
|
237 |
+ |
<PATH_ELEMENT> |
|
238 |
+ |
<option name="myItemId" value="PhonegapHelloWorld" /> |
|
239 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
|
240 |
+ |
</PATH_ELEMENT> |
|
241 |
+ |
<PATH_ELEMENT> |
|
242 |
+ |
<option name="myItemId" value="assets" /> |
|
243 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
|
244 |
+ |
</PATH_ELEMENT> |
|
245 |
+ |
<PATH_ELEMENT> |
|
246 |
+ |
<option name="myItemId" value="www" /> |
|
247 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
198 |
248 |
|
</PATH_ELEMENT> |
199 |
249 |
|
</PATH> |
200 |
250 |
|
</subPane> |
|
@@ -203,7 +253,7 @@ |
203 |
253 |
|
</component> |
204 |
254 |
|
<component name="PropertiesComponent"> |
205 |
255 |
|
<property name="GoToFile.includeJavaFiles" value="false" /> |
206 |
|
- |
<property name="project.structure.last.edited" value="Project" /> |
|
256 |
+ |
<property name="project.structure.last.edited" value="Modules" /> |
207 |
257 |
|
<property name="GoToClass.toSaveIncludeLibraries" value="false" /> |
208 |
258 |
|
<property name="project.structure.proportion" value="0.15" /> |
209 |
259 |
|
<property name="WebServerToolWindowFactoryState" value="false" /> |
|
@@ -333,34 +383,35 @@ |
333 |
383 |
|
<servers /> |
334 |
384 |
|
</component> |
335 |
385 |
|
<component name="ToolWindowManager"> |
336 |
|
- |
<frame x="1999" y="-314" width="1975" height="897" extended-state="0" /> |
337 |
|
- |
<editor active="false" /> |
|
386 |
+ |
<frame x="2796" y="-361" width="1208" height="1928" extended-state="6" /> |
|
387 |
+ |
<editor active="true" /> |
338 |
388 |
|
<layout> |
339 |
389 |
|
<window_info id="Data Sources" 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" /> |
340 |
390 |
|
<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" /> |
341 |
|
- |
<window_info id="JetGradle" 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" /> |
342 |
|
- |
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32952777" sideWeight="0.67" order="3" side_tool="false" content_ui="tabs" /> |
343 |
391 |
|
<window_info id="Palette" 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" /> |
344 |
392 |
|
<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" /> |
345 |
393 |
|
<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" /> |
346 |
|
- |
<window_info id="IDEtalk Messages" 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" /> |
347 |
394 |
|
<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="7" side_tool="true" content_ui="tabs" /> |
348 |
395 |
|
<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" /> |
349 |
|
- |
<window_info id="IDEtalk" 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" /> |
350 |
396 |
|
<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="7" side_tool="false" content_ui="tabs" /> |
351 |
397 |
|
<window_info id="Messages" 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" /> |
352 |
|
- |
<window_info id="Android" 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" /> |
353 |
398 |
|
<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" /> |
354 |
399 |
|
<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="true" content_ui="tabs" /> |
355 |
|
- |
<window_info id="Maven Projects" 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" /> |
356 |
|
- |
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
357 |
|
- |
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2496108" sideWeight="0.67" order="0" side_tool="false" content_ui="combo" /> |
358 |
|
- |
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
|
400 |
+ |
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2595486" sideWeight="0.6707796" order="0" side_tool="false" content_ui="combo" /> |
|
401 |
+ |
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3292204" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
|
402 |
+ |
<window_info id="Android Logcat" 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" /> |
|
403 |
+ |
<window_info id="IDEtalk Messages" 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" /> |
|
404 |
+ |
<window_info id="IDEtalk" 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" /> |
359 |
405 |
|
<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="tabs" /> |
360 |
406 |
|
<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" /> |
|
407 |
+ |
<window_info id="JetGradle" 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" /> |
361 |
408 |
|
<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" /> |
|
409 |
+ |
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32952777" sideWeight="0.67" order="3" side_tool="false" content_ui="tabs" /> |
362 |
410 |
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
|
411 |
+ |
<window_info id="Android" 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" /> |
363 |
412 |
|
<window_info id="Android Console" 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" /> |
|
413 |
+ |
<window_info id="Maven Projects" 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" /> |
|
414 |
+ |
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
364 |
415 |
|
<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" /> |
365 |
416 |
|
</layout> |
366 |
417 |
|
</component> |
|
@@ -397,10 +448,7 @@ |
397 |
448 |
|
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" /> |
398 |
449 |
|
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" /> |
399 |
450 |
|
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" /> |
400 |
|
- |
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" /> |
401 |
|
- |
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" /> |
402 |
451 |
|
<option name="FORCE_NON_EMPTY_COMMENT" value="false" /> |
403 |
|
- |
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" /> |
404 |
452 |
|
<option name="LAST_COMMIT_MESSAGE" /> |
405 |
453 |
|
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> |
406 |
454 |
|
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> |
|
@@ -425,14 +473,28 @@ |
425 |
473 |
|
<component name="editorHistoryManager"> |
426 |
474 |
|
<entry file="file://$PROJECT_DIR$/res/layout/main.xml"> |
427 |
475 |
|
<provider selected="true" editor-type-id="text-editor"> |
428 |
|
- |
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> |
|
476 |
+ |
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" /> |
|
477 |
+ |
</provider> |
|
478 |
+ |
</entry> |
|
479 |
+ |
<entry file="jar://$PROJECT_DIR$/libs/cordova-1.7.0rc1.jar!/org/apache/cordova/DroidGap.class"> |
|
480 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
|
481 |
+ |
<state line="45" column="16" selection-start="2216" selection-end="2216" vertical-scroll-proportion="0.4348837"> |
429 |
482 |
|
<folding /> |
430 |
483 |
|
</state> |
431 |
484 |
|
</provider> |
432 |
485 |
|
</entry> |
433 |
486 |
|
<entry file="file://$PROJECT_DIR$/src/com/example/MyActivity.java"> |
434 |
487 |
|
<provider selected="true" editor-type-id="text-editor"> |
435 |
|
- |
<state line="2" column="33" selection-start="50" selection-end="50" vertical-scroll-proportion="0.058939096"> |
|
488 |
+ |
<state line="3" column="83" selection-start="76" selection-end="76" vertical-scroll-proportion="0.0"> |
|
489 |
+ |
<folding> |
|
490 |
+ |
<element signature="imports" expanded="true" /> |
|
491 |
+ |
</folding> |
|
492 |
+ |
</state> |
|
493 |
+ |
</provider> |
|
494 |
+ |
</entry> |
|
495 |
+ |
<entry file="file://$PROJECT_DIR$/assets/www/index.html"> |
|
496 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
|
497 |
+ |
<state line="11" column="42" selection-start="189" selection-end="189" vertical-scroll-proportion="0.10796767"> |
436 |
498 |
|
<folding /> |
437 |
499 |
|
</state> |
438 |
500 |
|
</provider> |
|
@@ -490,7 +552,7 @@ |
490 |
552 |
|
</state> |
491 |
553 |
|
<state key="ModuleStructureConfigurable.UI"> |
492 |
554 |
|
<settings> |
493 |
|
- |
<last-edited>Android|PhonegapHelloWorld</last-edited> |
|
555 |
+ |
<last-edited>PhonegapHelloWorld</last-edited> |
494 |
556 |
|
<splitter-proportions> |
495 |
557 |
|
<option name="proportions"> |
496 |
558 |
|
<list> |