diff --git a/.idea/modules.xml b/.idea/modules.xml
index aa4991e53c08f118331aaf5081b4005e8cb5b725..4d8f81496fbfe41b088d398232e56d1b5f8bdebd 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -9,8 +9,8 @@
<module fileurl="file://$PROJECT_DIR$/PluginEqualizer/PluginEqualizer.iml" filepath="$PROJECT_DIR$/PluginEqualizer/PluginEqualizer.iml" />
<module fileurl="file://$PROJECT_DIR$/PluginLaunchpad/PluginLaunchpad.iml" filepath="$PROJECT_DIR$/PluginLaunchpad/PluginLaunchpad.iml" />
<module fileurl="file://$PROJECT_DIR$/PluginMedia/PluginMedia.iml" filepath="$PROJECT_DIR$/PluginMedia/PluginMedia.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallNativeMac/PluginNativeMac.iml" filepath="$PROJECT_DIR$/PlayWallNativeMac/PluginNativeMac.iml" />
- <module fileurl="file://$PROJECT_DIR$/PlayWallNativeWin/PluginNativeWin.iml" filepath="$PROJECT_DIR$/PlayWallNativeWin/PluginNativeWin.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PluginNativeMac/PluginNativeMac.iml" filepath="$PROJECT_DIR$/PluginNativeMac/PluginNativeMac.iml" />
+ <module fileurl="file://$PROJECT_DIR$/PluginNativeWin/PluginNativeWin.iml" filepath="$PROJECT_DIR$/PluginNativeWin/PluginNativeWin.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f9acefda915037be95f7239de12c023d3aeeb61d..51ee4db1c50dcd5f3267759dd6128f4248819880 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,25 +14,25 @@
</component>
<component name="ChangeListManager">
<list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="">
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/Strings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPadPane.fxml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/Actions.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/Actions.xml" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindActionConnect.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/image/ImageContent.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/MediaPlugin.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/PadContent.xml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/PadContent.xml" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/video_de.properties" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/video_de.properties" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/Strings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/Strings.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/assets/settingsPane.fxml" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContent.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContent.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/VideoSettings.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/VideoSettings.java" />
- <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/main/impl/MediaPluginUpdater.java" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" afterPath="$PROJECT_DIR$/PluginMedia/src/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java" />
</list>
<ignored path="$PROJECT_DIR$/PlayWall/bin/" />
<ignored path="$PROJECT_DIR$/PlayWallCore/bin/" />
@@ -78,7 +78,7 @@
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
- <navigator currentView="PackagesPane" proportions="" version="1">
+ <navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages PackagesPane="false" />
<showMembers />
<showModules />
@@ -92,30 +92,18 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="ProjectPane">
+ <pane id="PackagesPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="PlayWall" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PluginAction" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="actionsplugin" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <option name="myItemId" value="PlayWall" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
- </subPane>
- </pane>
- <pane id="PackagesPane">
- <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="PlayWall" />
@@ -125,25 +113,37 @@
<option name="myItemId" value="PlayWall" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="META-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
+ </PATH_ELEMENT>
</PATH>
+ </subPane>
+ </pane>
+ <pane id="Scratches" />
+ <pane id="ProjectPane">
+ <subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="PlayWall" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PlayWall" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ <option name="myItemId" value="PluginAction" />
+ <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.PackageElementNode" />
+ <option name="myItemId" value="src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="actionsplugin" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -387,9 +387,8 @@
<editor active="false" />
<layout>
<window_info id="Designer" 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" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18325435" 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" show_stripe_button="true" weight="0.17377567" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" 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" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette	" 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.32953367" sideWeight="0.50605583" order="7" side_tool="true" 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="false" weight="0.32953367" sideWeight="0.49394417" order="7" side_tool="false" content_ui="tabs" />
@@ -397,6 +396,7 @@
<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="Favorites" 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="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -543,13 +543,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-32">
- <caret line="6" column="36" lean-forward="false" selection-start-line="6" selection-start-column="36" selection-end-line="6" selection-end-column="36" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacUpdater.java" />
<entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/pad/conntent/PadContent.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
@@ -557,13 +551,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-47">
- <caret line="19" column="21" lean-forward="false" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
- </state>
- </provider>
- </entry>
+ <entry file="file://$PROJECT_DIR$/PlayWallNativeMac/src/de/tobias/playpad/namac/NativeAudioMacPluginImpl.java" />
<entry file="file://$PROJECT_DIR$/PlayWallCore/src/de/tobias/playpad/action/Action.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
@@ -589,7 +577,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="17" column="59" lean-forward="true" selection-start-line="17" selection-start-column="59" selection-end-line="17" selection-end-column="59" />
- <folding />
</state>
</provider>
</entry>
@@ -597,7 +584,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -644,7 +630,7 @@
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
- <last-edited>PluginNativeWin</last-edited>
+ <last-edited>PlayWall</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
diff --git a/PlayWall/PlayWall.iml b/PlayWall/PlayWall.iml
index 85a817c4a53d3894cb81c422bccf7304f87aab97..a8dd481f16d3735594d852dab9917b826c27d51d 100644
--- a/PlayWall/PlayWall.iml
+++ b/PlayWall/PlayWall.iml
@@ -29,7 +29,7 @@
<orderEntry type="library" exported="" name="HTML Builder" level="project" />
<orderEntry type="library" exported="" name="libUtils" level="project" />
<orderEntry type="library" exported="" name="Updater" level="project" />
- <orderEntry type="library" name="Json" level="project" />
+ <orderEntry type="library" exported="" name="Json" level="project" />
<orderEntry type="library" exported="" name="scala-sdk-2.12.1" level="application" />
</component>
</module>
\ No newline at end of file