From 2793897fb87dc75deef240b451d2df6fdc5dde3e Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sun, 7 Jul 2019 18:32:46 +0200 Subject: [PATCH] Rename black action in media plugin; Rename media plugin package --- .../media/action/BlackAction.java} | 14 ++++---- .../media/action/BlackActionFactory.java} | 12 +++---- .../media}/image/ImageContent.java | 4 +-- .../media}/image/ImagePadContentFactory.java | 2 +- .../media}/main/VideoSettings.java | 2 +- .../media}/main/impl/MediaPluginImpl.java | 34 ++++++++++--------- .../impl/MediaSettingsTabViewController.java | 4 +-- .../media}/main/impl/MediaViewController.java | 8 ++--- .../media}/main/impl/Strings.java | 2 +- .../media}/video/VideoContent.java | 4 +-- .../media}/video/VideoPadContentFactory.java | 6 ++-- .../VideoPadSettingsTabViewController.java | 4 +-- .../src/main/resources/Actions.xml | 2 +- .../src/main/resources/PadContent.xml | 4 +-- .../main/resources/lang/video_de.properties | 3 +- .../src/main/resources/plugin.yml | 2 +- 16 files changed, 55 insertions(+), 52 deletions(-) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin/blindaction/BlindAction.java => plugin/media/action/BlackAction.java} (88%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin/blindaction/BlindActionFactory.java => plugin/media/action/BlackActionFactory.java} (68%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/image/ImageContent.java (94%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/image/ImagePadContentFactory.java (98%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/main/VideoSettings.java (98%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/main/impl/MediaPluginImpl.java (81%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/main/impl/MediaSettingsTabViewController.java (97%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/main/impl/MediaViewController.java (95%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/main/impl/Strings.java (77%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/video/VideoContent.java (97%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/video/VideoPadContentFactory.java (91%) rename PlayWallPluginMedia/src/main/java/de/tobias/playpad/{mediaplugin => plugin/media}/video/VideoPadSettingsTabViewController.java (89%) diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java similarity index 88% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java index a2079c3b..42cfdd6b 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindAction.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackAction.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.mediaplugin.blindaction; +package de.tobias.playpad.plugin.media.action; import de.thecodelabs.utils.ui.icon.FontAwesomeType; import de.thecodelabs.utils.ui.icon.FontIcon; @@ -7,7 +7,7 @@ import de.tobias.playpad.action.Action; import de.tobias.playpad.action.InputType; import de.tobias.playpad.action.feedback.FeedbackMessage; import de.tobias.playpad.action.feedback.FeedbackType; -import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl; +import de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl; import de.tobias.playpad.project.Project; import de.tobias.playpad.viewcontroller.main.IMainViewController; import javafx.beans.property.BooleanProperty; @@ -18,11 +18,11 @@ import javafx.scene.Node; import javafx.scene.control.Label; import org.dom4j.Element; -public class BlindAction extends Action implements Displayable { +public class BlackAction extends Action implements Displayable { private ChangeListener<Boolean> blindFeedbackListener; - BlindAction() { + BlackAction() { blindFeedbackListener = (a, b, c) -> { if (c) { @@ -68,7 +68,7 @@ public class BlindAction extends Action implements Displayable { @Override public String getType() { - return BlindActionFactory.TYPE; + return BlackActionFactory.TYPE; } @Override @@ -86,7 +86,7 @@ public class BlindAction extends Action implements Displayable { @Override public StringProperty displayProperty() { - return new SimpleStringProperty(MediaPluginImpl.getInstance().getBundle().getString("blindaction.name")); + return new SimpleStringProperty(MediaPluginImpl.getInstance().getBundle().getString("black_action.name")); } @Override @@ -96,6 +96,6 @@ public class BlindAction extends Action implements Displayable { @Override public Action cloneAction() throws CloneNotSupportedException { - return (BlindAction) super.clone(); + return (BlackAction) super.clone(); } } diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionFactory.java similarity index 68% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionFactory.java index 0fa8a225..ea8bbc56 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/blindaction/BlindActionFactory.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/action/BlackActionFactory.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.mediaplugin.blindaction; +package de.tobias.playpad.plugin.media.action; import de.tobias.playpad.action.*; import de.tobias.playpad.profile.Profile; @@ -6,11 +6,11 @@ import javafx.scene.control.TreeItem; import java.util.List; -public class BlindActionFactory extends ActionFactory { +public class BlackActionFactory extends ActionFactory { - static final String TYPE = "BLIND"; + static final String TYPE = "BLACK"; - public BlindActionFactory(String type) { + public BlackActionFactory(String type) { super(type); } @@ -21,12 +21,12 @@ public class BlindActionFactory extends ActionFactory { @Override public void initActionType(Mapping mapping, Profile profile) { - mapping.addActionIfNotContains(new BlindAction()); + mapping.addActionIfNotContains(new BlackAction()); } @Override public Action newInstance() { - return new BlindAction(); + return new BlackAction(); } @Override diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java similarity index 94% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java index b2a45897..07690ba2 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImageContent.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImageContent.java @@ -1,10 +1,10 @@ -package de.tobias.playpad.mediaplugin.image; +package de.tobias.playpad.plugin.media.image; -import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.PadStatus; import de.tobias.playpad.pad.content.PadContent; import de.tobias.playpad.pad.mediapath.MediaPath; +import de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl; import javafx.application.Platform; import java.nio.file.Files; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java similarity index 98% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java index 7ec791ae..e8861e05 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/image/ImagePadContentFactory.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.mediaplugin.image; +package de.tobias.playpad.plugin.media.image; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.content.PadContent; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java similarity index 98% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java index fc8f3e13..a5f895fa 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/VideoSettings.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/VideoSettings.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.mediaplugin.main; +package de.tobias.playpad.plugin.media.main; import org.dom4j.Document; import org.dom4j.DocumentException; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java similarity index 81% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java index 91272291..0f26d81e 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaPluginImpl.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaPluginImpl.java @@ -1,17 +1,19 @@ -package de.tobias.playpad.mediaplugin.main.impl; +package de.tobias.playpad.plugin.media.main.impl; +import de.thecodelabs.logger.Logger; import de.thecodelabs.plugins.PluginArtifact; import de.thecodelabs.plugins.PluginDescriptor; import de.thecodelabs.utils.ui.icon.FontAwesomeType; import de.thecodelabs.utils.ui.icon.FontIcon; import de.thecodelabs.utils.ui.scene.HUD; import de.thecodelabs.utils.util.Localization; +import de.tobias.playpad.PlayPadPlugin; import de.tobias.playpad.action.ActionFactory; -import de.tobias.playpad.mediaplugin.main.VideoSettings; import de.tobias.playpad.pad.content.PadContentFactory; import de.tobias.playpad.plugin.Module; import de.tobias.playpad.plugin.PlayPadPluginStub; import de.tobias.playpad.plugin.SettingsListener; +import de.tobias.playpad.plugin.media.main.VideoSettings; import de.tobias.playpad.profile.Profile; import de.tobias.playpad.registry.Registry; import javafx.application.Platform; @@ -46,23 +48,23 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti @Override public void startup(PluginDescriptor descriptor) { // Init - instance = this; - module = new Module(descriptor.getName(), descriptor.getArtifactId()); + MediaPluginImpl.instance = this; + MediaPluginImpl.module = new Module(descriptor.getName(), descriptor.getArtifactId()); - blindProperty = new SimpleBooleanProperty(); + MediaPluginImpl.blindProperty = new SimpleBooleanProperty(); bundle = Localization.loadBundle("lang/video", getClass().getClassLoader()); videoViewController = new MediaViewController(settings); // Load Content Types try { - Registry<PadContentFactory> padContents = de.tobias.playpad.PlayPadPlugin.getRegistries().getPadContents(); + Registry<PadContentFactory> padContents = PlayPadPlugin.getRegistries().getPadContents(); padContents.loadComponentsFromFile("PadContent.xml", getClass().getClassLoader(), module, bundle); } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } - de.tobias.playpad.PlayPadPlugin.getInstance().addSettingsListener(this); + PlayPadPlugin.getInstance().addSettingsListener(this); if (Profile.currentProfile() != null) { onLoad(Profile.currentProfile()); @@ -85,14 +87,14 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti } try { - Registry<ActionFactory> padContents = de.tobias.playpad.PlayPadPlugin.getRegistries().getActions(); + Registry<ActionFactory> padContents = PlayPadPlugin.getRegistries().getActions(); padContents.loadComponentsFromFile("Actions.xml", getClass().getClassLoader(), module, bundle); } catch (Exception e) { - e.printStackTrace(); + Logger.error(e); } blindProperty.addListener(this); - System.out.println("Enable Media Plugin"); + Logger.debug("Enable Media Plugin"); } @Override @@ -101,7 +103,7 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti videoViewController.getStage().setFullScreen(false); videoViewController.getStage().close(); }); - System.out.println("Disable Media Plugin"); + Logger.debug("Disable Media Plugin"); } @Override @@ -111,9 +113,9 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti try { settings.load(path); } catch (NoSuchFileException e) { - System.out.println("No Media.xml config on folder"); + Logger.debug("No Media.xml config on folder"); } catch (DocumentException | IOException e) { - e.printStackTrace(); + Logger.error(e); } } @@ -124,7 +126,7 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti try { settings.save(path); } catch (IOException e) { - e.printStackTrace(); + Logger.error(e); } } @@ -154,7 +156,7 @@ public class MediaPluginImpl implements PlayPadPluginStub, PluginArtifact, Setti { if (newValue) { videoViewController.blind(true); - Pane root = (Pane) de.tobias.playpad.PlayPadPlugin.getInstance().getMainViewController().getParent(); + Pane root = (Pane) PlayPadPlugin.getInstance().getMainViewController().getParent(); if (blindHUD != null) blindHUD.addToParent(root); } else { diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java similarity index 97% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java index 002b5daf..a3833257 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaSettingsTabViewController.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaSettingsTabViewController.java @@ -1,6 +1,6 @@ -package de.tobias.playpad.mediaplugin.main.impl; +package de.tobias.playpad.plugin.media.main.impl; -import de.tobias.playpad.mediaplugin.main.VideoSettings; +import de.tobias.playpad.plugin.media.main.VideoSettings; import de.tobias.playpad.profile.Profile; import de.tobias.playpad.profile.ProfileSettings; import de.tobias.playpad.project.Project; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java similarity index 95% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java index a472434d..2137c19d 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/MediaViewController.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/MediaViewController.java @@ -1,15 +1,15 @@ -package de.tobias.playpad.mediaplugin.main.impl; +package de.tobias.playpad.plugin.media.main.impl; import de.thecodelabs.utils.application.ApplicationUtils; import de.thecodelabs.utils.application.container.PathType; import de.thecodelabs.utils.util.OS; import de.thecodelabs.utils.util.OS.OSType; import de.tobias.playpad.PlayPadPlugin; -import de.tobias.playpad.mediaplugin.image.ImageContent; -import de.tobias.playpad.mediaplugin.main.VideoSettings; -import de.tobias.playpad.mediaplugin.video.VideoContent; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.PadStatus; +import de.tobias.playpad.plugin.media.image.ImageContent; +import de.tobias.playpad.plugin.media.main.VideoSettings; +import de.tobias.playpad.plugin.media.video.VideoContent; import de.tobias.playpad.profile.Profile; import de.tobias.playpad.profile.ProfileListener; import javafx.application.Platform; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/Strings.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java similarity index 77% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/Strings.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java index 526606df..5363873f 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/main/impl/Strings.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/main/impl/Strings.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.mediaplugin.main.impl; +package de.tobias.playpad.plugin.media.main.impl; public class Strings { diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoContent.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java similarity index 97% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoContent.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java index 72671f8a..fe6b9f5a 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoContent.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoContent.java @@ -1,6 +1,5 @@ -package de.tobias.playpad.mediaplugin.video; +package de.tobias.playpad.plugin.media.video; -import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.PadSettings; import de.tobias.playpad.pad.PadStatus; @@ -9,6 +8,7 @@ import de.tobias.playpad.pad.content.play.Durationable; import de.tobias.playpad.pad.content.play.Pauseable; import de.tobias.playpad.pad.content.play.Seekable; import de.tobias.playpad.pad.mediapath.MediaPath; +import de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl; import de.tobias.playpad.volume.VolumeManager; import javafx.application.Platform; import javafx.beans.property.ObjectProperty; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java similarity index 91% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java index 9f46c2de..d4e86fcd 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadContentFactory.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadContentFactory.java @@ -1,11 +1,11 @@ -package de.tobias.playpad.mediaplugin.video; +package de.tobias.playpad.plugin.media.video; -import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl; -import de.tobias.playpad.mediaplugin.main.impl.MediaSettingsTabViewController; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.content.PadContent; import de.tobias.playpad.pad.content.PadContentFactory; import de.tobias.playpad.pad.view.IPadContentView; +import de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl; +import de.tobias.playpad.plugin.media.main.impl.MediaSettingsTabViewController; import de.tobias.playpad.viewcontroller.PadSettingsTabViewController; import de.tobias.playpad.viewcontroller.option.ProfileSettingsTabViewController; import javafx.geometry.Pos; diff --git a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java similarity index 89% rename from PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java rename to PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java index 37c7df4d..08540d0f 100644 --- a/PlayWallPluginMedia/src/main/java/de/tobias/playpad/mediaplugin/video/VideoPadSettingsTabViewController.java +++ b/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/video/VideoPadSettingsTabViewController.java @@ -1,7 +1,7 @@ -package de.tobias.playpad.mediaplugin.video; +package de.tobias.playpad.plugin.media.video; -import de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl; import de.tobias.playpad.pad.Pad; +import de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl; import de.tobias.playpad.viewcontroller.PadSettingsTabViewController; import javafx.fxml.FXML; import javafx.scene.control.CheckBox; diff --git a/PlayWallPluginMedia/src/main/resources/Actions.xml b/PlayWallPluginMedia/src/main/resources/Actions.xml index 52edd11e..a13d24e0 100644 --- a/PlayWallPluginMedia/src/main/resources/Actions.xml +++ b/PlayWallPluginMedia/src/main/resources/Actions.xml @@ -1,4 +1,4 @@ <Actions> - <Component id="BLIND" name="blindaction.name">de.tobias.playpad.mediaplugin.blindaction.BlindActionFactory + <Component id="BLIND" name="black_action.name">de.tobias.playpad.plugin.media.action.BlackActionFactory </Component> </Actions> \ No newline at end of file diff --git a/PlayWallPluginMedia/src/main/resources/PadContent.xml b/PlayWallPluginMedia/src/main/resources/PadContent.xml index 3215878e..b1b5f901 100644 --- a/PlayWallPluginMedia/src/main/resources/PadContent.xml +++ b/PlayWallPluginMedia/src/main/resources/PadContent.xml @@ -1,6 +1,6 @@ <Actions> - <Component id="video" name="Content.Video.Name">de.tobias.playpad.mediaplugin.video.VideoPadContentFactory + <Component id="video" name="Content.Video.Name">de.tobias.playpad.plugin.media.video.VideoPadContentFactory </Component> - <Component id="image" name="Content.Image.Name">de.tobias.playpad.mediaplugin.image.ImagePadContentFactory + <Component id="image" name="Content.Image.Name">de.tobias.playpad.plugin.media.image.ImagePadContentFactory </Component> </Actions> \ No newline at end of file diff --git a/PlayWallPluginMedia/src/main/resources/lang/video_de.properties b/PlayWallPluginMedia/src/main/resources/lang/video_de.properties index 59f1eb86..5b8ba754 100644 --- a/PlayWallPluginMedia/src/main/resources/lang/video_de.properties +++ b/PlayWallPluginMedia/src/main/resources/lang/video_de.properties @@ -6,6 +6,7 @@ settings.video.checkbox.fullscreen=Vollbild settings.video.checkbox.openAtLaunch=Fenster beim Start \uFFFDffnen pad.label.lastFrame=Letztes Bild am Ende des Videos einfrieren (Freeze) pad.checkbox.lastFrame=Aktivieren -blindaction.name=Schwarzbild Video + +black_action.name=Schwarzbild Video Content.Video.Name=Video Content.Image.Name=Bild \ No newline at end of file diff --git a/PlayWallPluginMedia/src/main/resources/plugin.yml b/PlayWallPluginMedia/src/main/resources/plugin.yml index 8e0a2412..fadb4301 100644 --- a/PlayWallPluginMedia/src/main/resources/plugin.yml +++ b/PlayWallPluginMedia/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ -main: "de.tobias.playpad.mediaplugin.main.impl.MediaPluginImpl" +main: "de.tobias.playpad.plugin.media.main.impl.MediaPluginImpl" name: "MediaPlugin" artifactId: "${pom.artifactId}" groupId: "${pom.groupId}" -- GitLab