|
|
|
@ -6,8 +6,15 @@
|
|
|
|
|
</artifacts-to-build>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
|
<list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="Merge remote-tracking branch 'origin/master' ">
|
|
|
|
|
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="" />
|
|
|
|
|
<list default="true" id="cdb932d9-7e58-4d94-93a9-e7b232ef17da" name="Default" comment="TrackList">
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem.fxml" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem.fxml" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" afterPath="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" />
|
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
|
|
</list>
|
|
|
|
|
<ignored path="JavaFxApplication.iws" />
|
|
|
|
|
<ignored path=".idea/workspace.xml" />
|
|
|
|
@ -72,21 +79,23 @@
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
|
|
|
|
|
<folding />
|
|
|
|
|
<caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="false" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
</file>
|
|
|
|
|
<file leaf-file-name="tracklist.fxml" pinned="false" current-in-tab="true">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.10778443">
|
|
|
|
|
<caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
|
|
|
|
|
<file leaf-file-name="interface.fxml" pinned="false" current-in-tab="true">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml">
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="32" column="35" selection-start-line="32" selection-start-column="35" selection-end-line="32" selection-end-column="35" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
<provider editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<provider selected="true" editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -138,14 +147,15 @@
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface-test.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/tools/URLProperty.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/Main.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackCollection.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java" />
|
|
|
|
|
<option value="$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml" />
|
|
|
|
|
</list>
|
|
|
|
|
</option>
|
|
|
|
|
</component>
|
|
|
|
@ -165,10 +175,25 @@
|
|
|
|
|
</component>
|
|
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
|
|
<component name="ProjectFrameBounds">
|
|
|
|
|
<option name="x" value="1196" />
|
|
|
|
|
<option name="y" value="-1417" />
|
|
|
|
|
<option name="width" value="1364" />
|
|
|
|
|
<option name="height" value="1417" />
|
|
|
|
|
<option name="y" value="23" />
|
|
|
|
|
<option name="width" value="1366" />
|
|
|
|
|
<option name="height" value="741" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ProjectInspectionProfilesVisibleTreeState">
|
|
|
|
|
<entry key="Project Default">
|
|
|
|
|
<profile-state>
|
|
|
|
|
<expanded-state>
|
|
|
|
|
<State>
|
|
|
|
|
<id />
|
|
|
|
|
</State>
|
|
|
|
|
</expanded-state>
|
|
|
|
|
<selected-state>
|
|
|
|
|
<State>
|
|
|
|
|
<id>Android</id>
|
|
|
|
|
</State>
|
|
|
|
|
</selected-state>
|
|
|
|
|
</profile-state>
|
|
|
|
|
</entry>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
|
|
|
|
<OptionsSetting value="true" id="Add" />
|
|
|
|
@ -293,34 +318,6 @@
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
</PATH>
|
|
|
|
|
<PATH>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value="Undefined" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value="Undefined" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value="META-INF" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
</PATH>
|
|
|
|
|
<PATH>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value="Undefined" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value="Undefined" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
<PATH_ELEMENT>
|
|
|
|
|
<option name="myItemId" value=".idea" />
|
|
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
|
|
</PATH_ELEMENT>
|
|
|
|
|
</PATH>
|
|
|
|
|
</subPane>
|
|
|
|
|
</pane>
|
|
|
|
|
<pane id="PackagesPane" />
|
|
|
|
@ -342,9 +339,9 @@
|
|
|
|
|
<property name="FullScreen" value="false" />
|
|
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
|
|
|
|
|
<property name="restartRequiresConfirmation" value="true" />
|
|
|
|
|
<property name="settings.editor.selected.configurable" value="configurable.group.editor" />
|
|
|
|
|
<property name="settings.editor.selected.configurable" value="editor.preferences.import" />
|
|
|
|
|
<property name="settings.editor.splitter.proportion" value="0.2" />
|
|
|
|
|
<property name="project.structure.last.edited" value="Problems" />
|
|
|
|
|
<property name="project.structure.last.edited" value="Artifacts" />
|
|
|
|
|
<property name="project.structure.proportion" value="0.15" />
|
|
|
|
|
<property name="project.structure.side.proportion" value="0.2" />
|
|
|
|
|
<property name="full.screen.before.presentation.mode" value="false" />
|
|
|
|
@ -354,6 +351,9 @@
|
|
|
|
|
<property name="OverrideImplement.overriding.sorted" value="false" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="RecentsManager">
|
|
|
|
|
<key name="CreateClassDialog.RecentsKey">
|
|
|
|
|
<recent name="io.makerforce.undefined.view" />
|
|
|
|
|
</key>
|
|
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
|
|
<recent name="$PROJECT_DIR$/src/io/makerforce/undefined/view" />
|
|
|
|
|
</key>
|
|
|
|
@ -688,7 +688,7 @@
|
|
|
|
|
<workItem from="1444621820059" duration="209000" />
|
|
|
|
|
<workItem from="1444622061126" duration="548000" />
|
|
|
|
|
<workItem from="1444622643506" duration="749000" />
|
|
|
|
|
<workItem from="1444628999813" duration="9216000" />
|
|
|
|
|
<workItem from="1444628999813" duration="20132000" />
|
|
|
|
|
</task>
|
|
|
|
|
<task id="LOCAL-00001" summary="Initial Commit">
|
|
|
|
|
<created>1444218455154</created>
|
|
|
|
@ -744,11 +744,17 @@
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1444647274223</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="10" />
|
|
|
|
|
<task id="LOCAL-00010" summary="Merge remote-tracking branch 'origin/master' ">
|
|
|
|
|
<created>1444647497850</created>
|
|
|
|
|
<option name="number" value="00010" />
|
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
|
<updated>1444647497850</updated>
|
|
|
|
|
</task>
|
|
|
|
|
<option name="localTasksCounter" value="11" />
|
|
|
|
|
<servers />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
|
<option name="totallyTimeSpent" value="40601000" />
|
|
|
|
|
<option name="totallyTimeSpent" value="51517000" />
|
|
|
|
|
</component>
|
|
|
|
|
<component name="TodoView">
|
|
|
|
|
<todo-panel id="selected-file">
|
|
|
|
@ -760,25 +766,25 @@
|
|
|
|
|
</todo-panel>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
|
<frame x="1196" y="-1417" width="1364" height="1417" extended-state="0" />
|
|
|
|
|
<frame x="0" y="23" width="1366" height="741" extended-state="6" />
|
|
|
|
|
<editor active="false" />
|
|
|
|
|
<layout>
|
|
|
|
|
<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="4" 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.32872504" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2901281" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28878647" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Palette	" active="false" anchor="left" 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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931423" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Application Servers" 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="Maven Projects" active="false" anchor="right" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2976639" sideWeight="0.5" order="5" 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.20045215" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21250942" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32780707" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40245774" sideWeight="0.5" order="2" 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.32780707" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Designer" active="false" anchor="right" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20347957" sideWeight="0.6703755" order="0" side_tool="false" content_ui="combo" />
|
|
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2205438" sideWeight="0.6703755" order="0" side_tool="false" content_ui="combo" />
|
|
|
|
|
<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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931423" sideWeight="0.5" order="1" 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="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24982457" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="UI Designer" active="false" anchor="left" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<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" />
|
|
|
|
@ -792,6 +798,36 @@
|
|
|
|
|
<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="5" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
|
|
|
|
|
</layout>
|
|
|
|
|
<layout-to-restore>
|
|
|
|
|
<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="4" 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="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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32931423" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Application Servers" 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="Maven Projects" active="false" anchor="right" 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="Designer" active="false" anchor="right" 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="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="Profiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="14" 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.24982457" 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="UI Designer" active="false" anchor="left" 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="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="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" 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.32872504" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28949356" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Palette	" active="false" anchor="left" 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="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2976639" sideWeight="0.5" order="5" 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.20045215" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.20937264" sideWeight="0.5" order="2" 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.32780707" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
|
|
<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="5" 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.16469261" sideWeight="0.6703755" order="0" side_tool="false" content_ui="combo" />
|
|
|
|
|
<window_info id="Problems" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" 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.32931423" sideWeight="0.5" order="1" 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.32980332" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
|
|
</layout-to-restore>
|
|
|
|
|
</component>
|
|
|
|
|
<component name="Vcs.Log.UiProperties">
|
|
|
|
|
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
|
|
|
@ -813,7 +849,8 @@
|
|
|
|
|
<MESSAGE value="CoverItem yay" />
|
|
|
|
|
<MESSAGE value="Cleanup" />
|
|
|
|
|
<MESSAGE value="Merge remote-tracking branch 'origin/master' " />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="Merge remote-tracking branch 'origin/master' " />
|
|
|
|
|
<MESSAGE value="TrackList" />
|
|
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="TrackList" />
|
|
|
|
|
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
|
|
|
|
|
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
|
|
|
|
|
<option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
|
|
|
|
@ -851,9 +888,7 @@
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -879,9 +914,7 @@
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="145" column="0" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -907,9 +940,7 @@
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="145" column="0" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -935,9 +966,7 @@
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="145" column="0" selection-start-line="145" selection-start-column="0" selection-end-line="145" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -963,9 +992,7 @@
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
@ -1110,55 +1137,6 @@
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.5575221">
|
|
|
|
|
<caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.65707964">
|
|
|
|
|
<caret line="100" column="22" selection-start-line="100" selection-start-column="22" selection-end-line="100" selection-end-column="22" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Track.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.19911504">
|
|
|
|
|
<caret line="12" column="16" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/Main.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.34845132">
|
|
|
|
|
<caret line="34" column="31" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="31" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.25714287">
|
|
|
|
|
<caret line="15" column="12" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
<provider editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/META-INF/MANIFEST.MF">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.04356244">
|
|
|
|
@ -1181,14 +1159,55 @@
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/model/Track.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.35714287">
|
|
|
|
|
<caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/Main.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/CoverItemController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.19646366">
|
|
|
|
|
<caret line="14" column="35" selection-start-line="14" selection-start-column="35" selection-end-line="14" selection-end-column="35" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="true" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.21233569">
|
|
|
|
|
<caret line="14" column="70" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
<provider editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/coveritem.fxml">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.27165353">
|
|
|
|
|
<caret line="23" column="28" selection-start-line="23" selection-start-column="28" selection-end-line="23" selection-end-column="28" />
|
|
|
|
|
<state vertical-scroll-proportion="0.16683519">
|
|
|
|
|
<caret line="11" column="40" selection-start-line="11" selection-start-column="40" selection-end-line="11" selection-end-column="40" />
|
|
|
|
|
<folding>
|
|
|
|
|
<marker date="1444647062000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
<marker date="1444647062000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
<marker date="1444647062000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
<marker date="1444660515000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
<marker date="1444660515000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
<marker date="1444660515000" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
@ -1196,22 +1215,32 @@
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/InterfaceController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
|
|
|
|
|
<caret line="128" column="33" selection-start-line="128" selection-start-column="33" selection-end-line="128" selection-end-column="33" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/tracklist.fxml">
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/TrackListController.java">
|
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.10778443">
|
|
|
|
|
<caret line="6" column="7" selection-start-line="6" selection-start-column="7" selection-end-line="6" selection-end-column="7" />
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
|
|
|
|
|
<folding>
|
|
|
|
|
<element signature="imports" expanded="false" />
|
|
|
|
|
</folding>
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|
<entry file="file://$PROJECT_DIR$/src/io/makerforce/undefined/view/interface.fxml">
|
|
|
|
|
<provider editor-type-id="text-editor">
|
|
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
|
|
<caret line="32" column="35" selection-start-line="32" selection-start-column="35" selection-end-line="32" selection-end-column="35" />
|
|
|
|
|
<folding />
|
|
|
|
|
</state>
|
|
|
|
|
</provider>
|
|
|
|
|
<provider editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<provider selected="true" editor-type-id="JavaFX-Scene-Builder">
|
|
|
|
|
<state />
|
|
|
|
|
</provider>
|
|
|
|
|
</entry>
|
|
|
|
|