tga/auto-subtitle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moves some classes

Browse Source
This commit is contained in:
Guillaume Tâche
2024-09-16 20:01:12 +02:00
parent 233b4bdb77
commit 17086a87ef
57 changed files with 242 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.main;
/** /**
* Controller for the main view * Controller for the main view

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MainModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/main/MainModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.main;
/** /**
* Model for the main view * Model for the main view

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.media;
/** /**
* Controller for the media view * Controller for the media view

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/MediaModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/media/MediaModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.media;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.subtitle.EditableSubtitle; import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.parameters;
/** /**
* Controller for the parameters view * Controller for the parameters view

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/ParametersModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/parameters/ParametersModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.parameters;
import com.github.gtache.autosubtitle.subtitle.OutputFormat; import com.github.gtache.autosubtitle.subtitle.OutputFormat;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.setup;
/** /**
* Controller for the setup view * Controller for the setup view

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SetupModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/setup/SetupModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.setup;
import com.github.gtache.autosubtitle.setup.SetupStatus; import com.github.gtache.autosubtitle.setup.SetupStatus;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.subtitles;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/SubtitlesModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/SubtitlesModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.subtitles;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.VideoInfo; import com.github.gtache.autosubtitle.VideoInfo;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkController.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.work;
import java.nio.file.Path; import java.nio.file.Path;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkModel.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.work;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.subtitle.SubtitleCollection; import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;

2
gui/api/src/main/java/com/github/gtache/autosubtitle/gui/WorkStatus.java → gui/api/src/main/java/com/github/gtache/autosubtitle/gui/work/WorkStatus.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui; package com.github.gtache.autosubtitle.gui.work;
/** /**
* Possible statuses for the work controller * Possible statuses for the work controller

6
gui/api/src/main/java/module-info.java
View File

@@ -4,4 +4,10 @@
module com.github.gtache.autosubtitle.gui.api { module com.github.gtache.autosubtitle.gui.api {
requires transitive com.github.gtache.autosubtitle.api; requires transitive com.github.gtache.autosubtitle.api;
exports com.github.gtache.autosubtitle.gui; exports com.github.gtache.autosubtitle.gui;
exports com.github.gtache.autosubtitle.gui.main;
exports com.github.gtache.autosubtitle.gui.media;
exports com.github.gtache.autosubtitle.gui.parameters;
exports com.github.gtache.autosubtitle.gui.setup;
exports com.github.gtache.autosubtitle.gui.subtitles;
exports com.github.gtache.autosubtitle.gui.work;
} }

5
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainController.java
View File

@@ -1,6 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.main.fx;
import com.github.gtache.autosubtitle.gui.MainController; import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
import com.github.gtache.autosubtitle.gui.main.MainController;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.TabPane; import javafx.scene.control.TabPane;
import javafx.stage.Window; import javafx.stage.Window;

4
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMainModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/main/fx/FXMainModel.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.main.fx;
import com.github.gtache.autosubtitle.gui.MainModel; import com.github.gtache.autosubtitle.gui.main.MainModel;
import javafx.beans.property.IntegerProperty; import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleIntegerProperty;

4
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaBinder.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaBinder.java
View File

@@ -1,5 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.gui.fx.FXBinder;
import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javax.inject.Inject; import javax.inject.Inject;

4
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaController.java
View File

@@ -1,8 +1,8 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.File; import com.github.gtache.autosubtitle.File;
import com.github.gtache.autosubtitle.gui.MediaController;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import com.github.gtache.autosubtitle.gui.media.MediaController;
import com.github.gtache.autosubtitle.modules.gui.impl.Pause; import com.github.gtache.autosubtitle.modules.gui.impl.Pause;
import com.github.gtache.autosubtitle.modules.gui.impl.Play; import com.github.gtache.autosubtitle.modules.gui.impl.Play;
import com.github.gtache.autosubtitle.subtitle.Subtitle; import com.github.gtache.autosubtitle.subtitle.Subtitle;

6
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXMediaModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/media/fx/FXMediaModel.java
View File

@@ -1,7 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.MediaModel; import com.github.gtache.autosubtitle.gui.media.MediaModel;
import com.github.gtache.autosubtitle.subtitle.EditableSubtitle; import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javafx.beans.property.*; import javafx.beans.property.*;
@@ -12,7 +12,7 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
/** /**
* FX implementation of {@link com.github.gtache.autosubtitle.gui.MediaModel} * FX implementation of {@link MediaModel}
*/ */
@Singleton @Singleton
public class FXMediaModel implements MediaModel { public class FXMediaModel implements MediaModel {

5
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersController.java
View File

@@ -1,6 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.parameters.fx;
import com.github.gtache.autosubtitle.gui.ParametersController; import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
import com.github.gtache.autosubtitle.gui.parameters.ParametersController;
import com.github.gtache.autosubtitle.subtitle.OutputFormat; import com.github.gtache.autosubtitle.subtitle.OutputFormat;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;

6
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXParametersModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/parameters/fx/FXParametersModel.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.parameters.fx;
import com.github.gtache.autosubtitle.gui.ParametersModel; import com.github.gtache.autosubtitle.gui.parameters.ParametersModel;
import com.github.gtache.autosubtitle.modules.impl.FontName; import com.github.gtache.autosubtitle.modules.impl.FontName;
import com.github.gtache.autosubtitle.modules.impl.FontSize; import com.github.gtache.autosubtitle.modules.impl.FontSize;
import com.github.gtache.autosubtitle.modules.impl.MaxLineLength; import com.github.gtache.autosubtitle.modules.impl.MaxLineLength;
@@ -65,7 +65,7 @@ public class FXParametersModel implements ParametersModel {
extractionModel.set(model); extractionModel.set(model);
} }
ObjectProperty<ExtractionModel> extractionModelProperty() { public ObjectProperty<ExtractionModel> extractionModelProperty() {
return extractionModel; return extractionModel;
} }

5
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupController.java
View File

@@ -1,6 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.setup.fx;
import com.github.gtache.autosubtitle.gui.SetupController; import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
import com.github.gtache.autosubtitle.gui.setup.SetupController;
import com.github.gtache.autosubtitle.modules.setup.impl.SubtitleExtractorSetup; import com.github.gtache.autosubtitle.modules.setup.impl.SubtitleExtractorSetup;
import com.github.gtache.autosubtitle.modules.setup.impl.TranslatorSetup; import com.github.gtache.autosubtitle.modules.setup.impl.TranslatorSetup;
import com.github.gtache.autosubtitle.modules.setup.impl.VideoConverterSetup; import com.github.gtache.autosubtitle.modules.setup.impl.VideoConverterSetup;

4
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSetupModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/setup/fx/FXSetupModel.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.setup.fx;
import com.github.gtache.autosubtitle.gui.SetupModel; import com.github.gtache.autosubtitle.gui.setup.SetupModel;
import com.github.gtache.autosubtitle.setup.SetupStatus; import com.github.gtache.autosubtitle.setup.SetupStatus;
import javafx.beans.property.DoubleProperty; import javafx.beans.property.DoubleProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;

6
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesBinder.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesBinder.java
View File

@@ -1,8 +1,10 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.WorkStatus; import com.github.gtache.autosubtitle.gui.fx.FXBinder;
import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
import com.github.gtache.autosubtitle.gui.work.WorkStatus;
import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl; import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;

5
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesController.java
View File

@@ -1,8 +1,9 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.gui.SubtitlesController;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
import com.github.gtache.autosubtitle.gui.subtitles.SubtitlesController;
import com.github.gtache.autosubtitle.subtitle.SubtitleCollection; import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
import com.github.gtache.autosubtitle.subtitle.SubtitleImporterExporter; import com.github.gtache.autosubtitle.subtitle.SubtitleImporterExporter;
import com.github.gtache.autosubtitle.subtitle.converter.ParseException; import com.github.gtache.autosubtitle.subtitle.converter.ParseException;

4
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXSubtitlesModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/FXSubtitlesModel.java
View File

@@ -1,8 +1,8 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.VideoInfo; import com.github.gtache.autosubtitle.VideoInfo;
import com.github.gtache.autosubtitle.gui.SubtitlesModel; import com.github.gtache.autosubtitle.gui.subtitles.SubtitlesModel;
import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl; import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleCollectionImpl;
import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl; import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;

2
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/LanguageStringConverter.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/LanguageStringConverter.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import javafx.util.StringConverter; import javafx.util.StringConverter;

2
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/TimeStringConverter.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TimeStringConverter.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import javafx.util.StringConverter; import javafx.util.StringConverter;

5
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkBinder.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkBinder.java
View File

@@ -1,4 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.gui.fx.FXBinder;
import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersModel;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;

8
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkController.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkController.java
View File

@@ -1,9 +1,11 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.VideoConverter; import com.github.gtache.autosubtitle.VideoConverter;
import com.github.gtache.autosubtitle.VideoLoader; import com.github.gtache.autosubtitle.VideoLoader;
import com.github.gtache.autosubtitle.gui.WorkController; import com.github.gtache.autosubtitle.gui.fx.AbstractFXController;
import com.github.gtache.autosubtitle.gui.WorkStatus; import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
import com.github.gtache.autosubtitle.gui.work.WorkController;
import com.github.gtache.autosubtitle.gui.work.WorkStatus;
import com.github.gtache.autosubtitle.subtitle.SubtitleCollection; import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractEvent; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractEvent;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractException; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractException;

22
gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/fx/FXWorkModel.java → gui/fx/src/main/java/com/github/gtache/autosubtitle/gui/work/fx/FXWorkModel.java
View File

@@ -1,9 +1,9 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.WorkModel; import com.github.gtache.autosubtitle.gui.work.WorkModel;
import com.github.gtache.autosubtitle.gui.WorkStatus; import com.github.gtache.autosubtitle.gui.work.WorkStatus;
import com.github.gtache.autosubtitle.subtitle.EditableSubtitle; import com.github.gtache.autosubtitle.subtitle.EditableSubtitle;
import com.github.gtache.autosubtitle.subtitle.SubtitleCollection; import com.github.gtache.autosubtitle.subtitle.SubtitleCollection;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
@@ -72,7 +72,7 @@ public class FXWorkModel implements WorkModel {
this.video.set(video); this.video.set(video);
} }
ObjectProperty<Video> videoProperty() { public ObjectProperty<Video> videoProperty() {
return video; return video;
} }
@@ -100,7 +100,7 @@ public class FXWorkModel implements WorkModel {
workStatus.set(status); workStatus.set(status);
} }
ObjectProperty<WorkStatus> statusProperty() { public ObjectProperty<WorkStatus> statusProperty() {
return workStatus; return workStatus;
} }
@@ -137,7 +137,7 @@ public class FXWorkModel implements WorkModel {
this.canExport.set(canExport); this.canExport.set(canExport);
} }
BooleanProperty canExportProperty() { public BooleanProperty canExportProperty() {
return canExport; return canExport;
} }
@@ -160,23 +160,23 @@ public class FXWorkModel implements WorkModel {
extractedCollection.set(collection); extractedCollection.set(collection);
} }
ObjectProperty<SubtitleCollection<?>> extractedCollectionProperty() { public ObjectProperty<SubtitleCollection<?>> extractedCollectionProperty() {
return extractedCollection; return extractedCollection;
} }
ObjectProperty<EditableSubtitle> selectedSubtitleProperty() { public ObjectProperty<EditableSubtitle> selectedSubtitleProperty() {
return selectedSubtitle; return selectedSubtitle;
} }
ObservableList<ObservableSubtitleImpl> subtitles() { public ObservableList<ObservableSubtitleImpl> subtitles() {
return subtitles; return subtitles;
} }
ObservableMap<Language, ObservableSubtitleCollectionImpl> collections() { public ObservableMap<Language, ObservableSubtitleCollectionImpl> collections() {
return collections; return collections;
} }
ObjectProperty<Language> videoLanguageProperty() { public ObjectProperty<Language> videoLanguageProperty() {
return videoLanguage; return videoLanguage;
} }
} }

12
gui/fx/src/main/java/com/github/gtache/autosubtitle/modules/gui/fx/FXModule.java
View File

@@ -2,12 +2,12 @@ package com.github.gtache.autosubtitle.modules.gui.fx;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import com.github.gtache.autosubtitle.gui.fx.ColonTimeFormatter; import com.github.gtache.autosubtitle.gui.fx.ColonTimeFormatter;
import com.github.gtache.autosubtitle.gui.fx.FXMainController; import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
import com.github.gtache.autosubtitle.gui.fx.FXMediaController; import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
import com.github.gtache.autosubtitle.gui.fx.FXParametersController; import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController;
import com.github.gtache.autosubtitle.gui.fx.FXSetupController; import com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController;
import com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController; import com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController;
import com.github.gtache.autosubtitle.gui.fx.FXWorkController; import com.github.gtache.autosubtitle.gui.work.fx.FXWorkController;
import com.github.gtache.autosubtitle.modules.gui.impl.Pause; import com.github.gtache.autosubtitle.modules.gui.impl.Pause;
import com.github.gtache.autosubtitle.modules.gui.impl.Play; import com.github.gtache.autosubtitle.modules.gui.impl.Play;
import com.github.gtache.autosubtitle.modules.setup.gui.fx.FXSetupModule; import com.github.gtache.autosubtitle.modules.setup.gui.fx.FXSetupModule;

2
gui/fx/src/main/java/com/github/gtache/autosubtitle/setup/gui/fx/FXSetupUserBridge.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.autosubtitle.setup.gui.fx; package com.github.gtache.autosubtitle.setup.gui.fx;
import com.github.gtache.autosubtitle.gui.fx.FXMainController; import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
import com.github.gtache.autosubtitle.setup.SetupUserBridge; import com.github.gtache.autosubtitle.setup.SetupUserBridge;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.scene.control.Alert; import javafx.scene.control.Alert;

12
gui/fx/src/main/java/module-info.java
View File

@@ -17,4 +17,16 @@ module com.github.gtache.autosubtitle.gui.fx {
exports com.github.gtache.autosubtitle.subtitle.gui.fx; exports com.github.gtache.autosubtitle.subtitle.gui.fx;
exports com.github.gtache.autosubtitle.modules.gui.fx; exports com.github.gtache.autosubtitle.modules.gui.fx;
opens com.github.gtache.autosubtitle.gui.fx to javafx.fxml; opens com.github.gtache.autosubtitle.gui.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.main.fx;
opens com.github.gtache.autosubtitle.gui.main.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.media.fx;
opens com.github.gtache.autosubtitle.gui.media.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.parameters.fx;
opens com.github.gtache.autosubtitle.gui.parameters.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.setup.fx;
opens com.github.gtache.autosubtitle.gui.setup.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.subtitles.fx;
opens com.github.gtache.autosubtitle.gui.subtitles.fx to javafx.fxml;
exports com.github.gtache.autosubtitle.gui.work.fx;
opens com.github.gtache.autosubtitle.gui.work.fx to javafx.fxml;
} }

2
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mainView.fxml
View File

@@ -3,7 +3,7 @@
<?import javafx.scene.control.Tab?> <?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?> <?import javafx.scene.control.TabPane?>
<TabPane fx:id="tabPane" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" <TabPane fx:id="tabPane" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.fx.FXMainController"> fx:controller="com.github.gtache.autosubtitle.gui.main.fx.FXMainController">
<tabs> <tabs>
<Tab closable="false" text="%main.tab.work.label"> <Tab closable="false" text="%main.tab.work.label">
<content> <content>

2
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/mediaView.fxml
View File

@@ -11,7 +11,7 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.media.MediaView?> <?import javafx.scene.media.MediaView?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" <BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.fx.FXMediaController"> fx:controller="com.github.gtache.autosubtitle.gui.media.fx.FXMediaController">
<bottom> <bottom>
<VBox BorderPane.alignment="CENTER"> <VBox BorderPane.alignment="CENTER">
<children> <children>

10
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/parametersView.fxml
View File

@@ -9,7 +9,9 @@
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<?import org.controlsfx.control.PrefixSelectionComboBox?> <?import org.controlsfx.control.PrefixSelectionComboBox?>
<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXParametersController"> <GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="10.0"
xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES"/> <ColumnConstraints hgrow="SOMETIMES"/>
<ColumnConstraints hgrow="SOMETIMES"/> <ColumnConstraints hgrow="SOMETIMES"/>
@@ -32,8 +34,10 @@
<Label text="%parameters.subtitles.font.family" GridPane.rowIndex="2"/> <Label text="%parameters.subtitles.font.family" GridPane.rowIndex="2"/>
<PrefixSelectionComboBox fx:id="fontFamilyCombobox" GridPane.columnIndex="1" GridPane.rowIndex="2"/> <PrefixSelectionComboBox fx:id="fontFamilyCombobox" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
<TextField fx:id="fontSizeField" GridPane.columnIndex="1" GridPane.rowIndex="3"/> <TextField fx:id="fontSizeField" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
<Button mnemonicParsing="false" onAction="#savePressed" text="%parameters.button.save.label" GridPane.columnIndex="1" GridPane.rowIndex="6" /> <Button mnemonicParsing="false" onAction="#savePressed" text="%parameters.button.save.label"
<Button mnemonicParsing="false" onAction="#resetPressed" text="%parameters.button.reset.label" GridPane.rowIndex="6" /> GridPane.columnIndex="1" GridPane.rowIndex="6"/>
<Button mnemonicParsing="false" onAction="#resetPressed" text="%parameters.button.reset.label"
GridPane.rowIndex="6"/>
<Label text="%parameters.subtitles.max.length.label" GridPane.rowIndex="4"/> <Label text="%parameters.subtitles.max.length.label" GridPane.rowIndex="4"/>
<Label text="%parameters.subtitles.max.lines.label" GridPane.rowIndex="5"/> <Label text="%parameters.subtitles.max.lines.label" GridPane.rowIndex="5"/>
<TextField fx:id="maxLengthField" GridPane.columnIndex="1" GridPane.rowIndex="4"/> <TextField fx:id="maxLengthField" GridPane.columnIndex="1" GridPane.rowIndex="4"/>

21
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/setupView.fxml
View File

@@ -8,7 +8,8 @@
<?import javafx.scene.layout.GridPane?> <?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXSetupController"> <GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES"/> <ColumnConstraints hgrow="SOMETIMES"/>
<ColumnConstraints hgrow="SOMETIMES"/> <ColumnConstraints hgrow="SOMETIMES"/>
@@ -30,13 +31,19 @@
<Label fx:id="extractorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="2"/> <Label fx:id="extractorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
<Label fx:id="translatorNameLabel" text="Label" GridPane.rowIndex="3"/> <Label fx:id="translatorNameLabel" text="Label" GridPane.rowIndex="3"/>
<Label fx:id="translatorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3"/> <Label fx:id="translatorStatusLabel" text="Label" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
<MenuButton fx:id="converterButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="1" /> <MenuButton fx:id="converterButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
<MenuButton fx:id="extractorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="2" /> GridPane.rowIndex="1"/>
<MenuButton fx:id="translatorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2" GridPane.rowIndex="3" /> <MenuButton fx:id="extractorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
GridPane.rowIndex="2"/>
<MenuButton fx:id="translatorButton" mnemonicParsing="false" text="%setup.menu.label" GridPane.columnIndex="2"
GridPane.rowIndex="3"/>
<Label text="%setup.description.label" GridPane.columnSpan="2147483647"/> <Label text="%setup.description.label" GridPane.columnSpan="2147483647"/>
<ProgressBar fx:id="converterProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="1" /> <ProgressBar fx:id="converterProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
<ProgressBar fx:id="extractorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="2" /> GridPane.rowIndex="1"/>
<ProgressBar fx:id="translatorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3" GridPane.rowIndex="3" /> <ProgressBar fx:id="extractorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
GridPane.rowIndex="2"/>
<ProgressBar fx:id="translatorProgress" prefWidth="200.0" progress="0.0" GridPane.columnIndex="3"
GridPane.rowIndex="3"/>
<Label fx:id="converterProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="1"/> <Label fx:id="converterProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="1"/>
<Label fx:id="extractorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="2"/> <Label fx:id="extractorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="2"/>
<Label fx:id="translatorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="3"/> <Label fx:id="translatorProgressLabel" text="Label" GridPane.columnIndex="4" GridPane.rowIndex="3"/>

21
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/subtitlesView.fxml
View File

@@ -11,7 +11,8 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import org.controlsfx.control.PrefixSelectionComboBox?> <?import org.controlsfx.control.PrefixSelectionComboBox?>
<VBox spacing="10" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController"> <VBox spacing="10" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController">
<children> <children>
<HBox alignment="CENTER_LEFT" spacing="10.0"> <HBox alignment="CENTER_LEFT" spacing="10.0">
<children> <children>
@@ -27,9 +28,12 @@
<content> <content>
<TableView fx:id="subtitlesTable" editable="true"> <TableView fx:id="subtitlesTable" editable="true">
<columns> <columns>
<TableColumn fx:id="startColumn" prefWidth="50.0" sortable="false" text="%subtitles.table.column.from.label" /> <TableColumn fx:id="startColumn" prefWidth="50.0" sortable="false"
<TableColumn fx:id="endColumn" prefWidth="50.0" sortable="false" text="%subtitles.table.column.to.label" /> text="%subtitles.table.column.from.label"/>
<TableColumn fx:id="textColumn" prefWidth="75.0" sortable="false" text="%subtitles.table.column.text.label" /> <TableColumn fx:id="endColumn" prefWidth="50.0" sortable="false"
text="%subtitles.table.column.to.label"/>
<TableColumn fx:id="textColumn" prefWidth="75.0" sortable="false"
text="%subtitles.table.column.text.label"/>
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
@@ -41,9 +45,12 @@
</TabPane> </TabPane>
<HBox spacing="10.0"> <HBox spacing="10.0">
<children> <children>
<Button fx:id="loadButton" mnemonicParsing="false" onAction="#loadPressed" text="%subtitles.button.load.label" /> <Button fx:id="loadButton" mnemonicParsing="false" onAction="#loadPressed"
<Button fx:id="saveButton" mnemonicParsing="false" onAction="#savePressed" text="%subtitles.button.subtitles.save.label" /> text="%subtitles.button.load.label"/>
<Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonPressed" text="%subtitles.button.reset.label" /> <Button fx:id="saveButton" mnemonicParsing="false" onAction="#savePressed"
text="%subtitles.button.subtitles.save.label"/>
<Button fx:id="resetButton" mnemonicParsing="false" onAction="#resetButtonPressed"
text="%subtitles.button.reset.label"/>
<Button fx:id="addButton" mnemonicParsing="false" onAction="#addPressed" text="+"/> <Button fx:id="addButton" mnemonicParsing="false" onAction="#addPressed" text="+"/>
</children> </children>
</HBox> </HBox>

22
gui/fx/src/main/resources/com/github/gtache/autosubtitle/gui/fx/workView.fxml
View File

@@ -11,7 +11,8 @@
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.RowConstraints?> <?import javafx.scene.layout.RowConstraints?>
<GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.github.gtache.autosubtitle.gui.fx.FXWorkController"> <GridPane hgap="10.0" vgap="10.0" xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.autosubtitle.gui.work.fx.FXWorkController">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="SOMETIMES"/> <ColumnConstraints hgrow="SOMETIMES"/>
<ColumnConstraints hgrow="ALWAYS"/> <ColumnConstraints hgrow="ALWAYS"/>
@@ -25,28 +26,35 @@
</rowConstraints> </rowConstraints>
<children> <children>
<TextField fx:id="fileField" editable="false" GridPane.columnIndex="1"/> <TextField fx:id="fileField" editable="false" GridPane.columnIndex="1"/>
<Button mnemonicParsing="false" onAction="#fileButtonPressed" text="%work.button.file.label" GridPane.columnIndex="2" /> <Button mnemonicParsing="false" onAction="#fileButtonPressed" text="%work.button.file.label"
GridPane.columnIndex="2"/>
<HBox spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="2"> <HBox spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children> <children>
<Button fx:id="extractButton" mnemonicParsing="false" onAction="#extractPressed" text="%work.button.extract.label" /> <Button fx:id="extractButton" mnemonicParsing="false" onAction="#extractPressed"
text="%work.button.extract.label"/>
</children> </children>
</HBox> </HBox>
<HBox alignment="CENTER_RIGHT" spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="2"> <HBox alignment="CENTER_RIGHT" spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
<children> <children>
<Button fx:id="exportSoftButton" mnemonicParsing="false" onAction="#exportSoftPressed" text="%work.button.export.soft.label"> <Button fx:id="exportSoftButton" mnemonicParsing="false" onAction="#exportSoftPressed"
text="%work.button.export.soft.label">
<tooltip> <tooltip>
<Tooltip text="%work.button.export.soft.tooltip"/> <Tooltip text="%work.button.export.soft.tooltip"/>
</tooltip> </tooltip>
</Button> </Button>
<Button fx:id="exportHardButton" mnemonicParsing="false" onAction="#exportHardPressed" text="%work.button.export.hard.label"> <Button fx:id="exportHardButton" mnemonicParsing="false" onAction="#exportHardPressed"
text="%work.button.export.hard.label">
<tooltip> <tooltip>
<Tooltip text="%work.button.export.hard.tooltip"/> <Tooltip text="%work.button.export.hard.tooltip"/>
</tooltip> </tooltip>
</Button> </Button>
</children> </children>
</HBox> </HBox>
<fx:include fx:id="subtitles" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" source="subtitlesView.fxml" GridPane.columnIndex="0" GridPane.columnSpan="1" GridPane.rowIndex="0" GridPane.rowSpan="3" GridPane.vgrow="ALWAYS" /> <fx:include fx:id="subtitles" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
<fx:include fx:id="media" source="mediaView.fxml" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" /> source="subtitlesView.fxml" GridPane.columnIndex="0" GridPane.columnSpan="1" GridPane.rowIndex="0"
GridPane.rowSpan="3" GridPane.vgrow="ALWAYS"/>
<fx:include fx:id="media" source="mediaView.fxml" GridPane.columnIndex="1" GridPane.columnSpan="2147483647"
GridPane.rowIndex="1"/>
<Label fx:id="progressLabel" GridPane.columnIndex="1" GridPane.rowIndex="3"/> <Label fx:id="progressLabel" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
<HBox spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="3"> <HBox spacing="10.0" GridPane.columnIndex="2" GridPane.rowIndex="3">
<children> <children>

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.main.fx;
import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent; import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMainModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/main/fx/TestFXMainModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.main.fx;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

6
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaBinder.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaBinder.java
View File

@@ -1,6 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.work.fx.FXWorkModel;
import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl; import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@@ -9,12 +10,13 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
class TestFXMediaBinder { class TestFXMediaBinder {
@Test @Test
void testCreateBindings() { void testCreateBindings() {
final var workModel = new FXWorkModel(); final var workModel = spy(FXWorkModel.class);
final var mediaModel = new FXMediaModel(); final var mediaModel = new FXMediaModel();
final var binder = new FXMediaBinder(workModel, mediaModel); final var binder = new FXMediaBinder(workModel, mediaModel);
binder.createBindings(); binder.createBindings();

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXMediaModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/media/fx/TestFXMediaModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.media.fx;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.VideoInfo; import com.github.gtache.autosubtitle.VideoInfo;

3
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersController.java
View File

@@ -1,8 +1,9 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.parameters.fx;
import com.github.gtache.autosubtitle.VideoConverter; import com.github.gtache.autosubtitle.VideoConverter;
import com.github.gtache.autosubtitle.VideoLoader; import com.github.gtache.autosubtitle.VideoLoader;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import com.github.gtache.autosubtitle.gui.work.fx.FXWorkBinder;
import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent; import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter; import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXParametersModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/parameters/fx/TestFXParametersModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.parameters.fx;
import com.github.gtache.autosubtitle.subtitle.OutputFormat; import com.github.gtache.autosubtitle.subtitle.OutputFormat;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;

3
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupController.java
View File

@@ -1,8 +1,9 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.setup.fx;
import com.github.gtache.autosubtitle.VideoConverter; import com.github.gtache.autosubtitle.VideoConverter;
import com.github.gtache.autosubtitle.VideoLoader; import com.github.gtache.autosubtitle.VideoLoader;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import com.github.gtache.autosubtitle.gui.work.fx.FXWorkBinder;
import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent; import com.github.gtache.autosubtitle.modules.gui.fx.DaggerResourceComponent;
import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter; import com.github.gtache.autosubtitle.subtitle.converter.SubtitleConverter;
import com.github.gtache.autosubtitle.subtitle.extractor.SubtitleExtractor; import com.github.gtache.autosubtitle.subtitle.extractor.SubtitleExtractor;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSetupModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/setup/fx/TestFXSetupModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.setup.fx;
import com.github.gtache.autosubtitle.setup.SetupStatus; import com.github.gtache.autosubtitle.setup.SetupStatus;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.VideoConverter; import com.github.gtache.autosubtitle.VideoConverter;
import com.github.gtache.autosubtitle.VideoLoader; import com.github.gtache.autosubtitle.VideoLoader;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXSubtitlesModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestFXSubtitlesModel.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl; import com.github.gtache.autosubtitle.subtitle.gui.fx.ObservableSubtitleImpl;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestLanguageStringConverter.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestLanguageStringConverter.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.Language; import com.github.gtache.autosubtitle.Language;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestTimeStringConverter.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/subtitles/fx/TestTimeStringConverter.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.subtitles.fx;
import com.github.gtache.autosubtitle.gui.TimeFormatter; import com.github.gtache.autosubtitle.gui.TimeFormatter;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

7
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkBinder.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkBinder.java
View File

@@ -1,18 +1,19 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersModel;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModelProvider;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.*;
class TestFXWorkBinder { class TestFXWorkBinder {
@Test @Test
void testBindings() { void testBindings() {
final var workModel = new FXWorkModel(); final var workModel = new FXWorkModel();
final var parametersModel = new FXParametersModel(mock(ExtractionModelProvider.class), "Arial", 12, 40, 1); final var parametersModel = mock(FXParametersModel.class, withSettings().defaultAnswer(CALLS_REAL_METHODS).useConstructor(mock(ExtractionModelProvider.class), "Arial", 12, 40, 1));
final var binder = new FXWorkBinder(workModel, parametersModel); final var binder = new FXWorkBinder(workModel, parametersModel);
binder.createBindings(); binder.createBindings();
assertNull(workModel.extractionModel()); assertNull(workModel.extractionModel());

2
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkController.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkController.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.VideoConverter; import com.github.gtache.autosubtitle.VideoConverter;
import com.github.gtache.autosubtitle.VideoLoader; import com.github.gtache.autosubtitle.VideoLoader;

4
gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/fx/TestFXWorkModel.java → gui/fx/src/test/java/com/github/gtache/autosubtitle/gui/work/fx/TestFXWorkModel.java
View File

@@ -1,7 +1,7 @@
package com.github.gtache.autosubtitle.gui.fx; package com.github.gtache.autosubtitle.gui.work.fx;
import com.github.gtache.autosubtitle.Video; import com.github.gtache.autosubtitle.Video;
import com.github.gtache.autosubtitle.gui.WorkStatus; import com.github.gtache.autosubtitle.gui.work.WorkStatus;
import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel; import com.github.gtache.autosubtitle.subtitle.extractor.ExtractionModel;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

12
gui/fx/src/test/java/com/github/gtache/autosubtitle/modules/gui/fx/TestFXModule.java
View File

@@ -1,11 +1,11 @@
package com.github.gtache.autosubtitle.modules.gui.fx; package com.github.gtache.autosubtitle.modules.gui.fx;
import com.github.gtache.autosubtitle.gui.fx.FXMainController; import com.github.gtache.autosubtitle.gui.main.fx.FXMainController;
import com.github.gtache.autosubtitle.gui.fx.FXMediaController; import com.github.gtache.autosubtitle.gui.media.fx.FXMediaController;
import com.github.gtache.autosubtitle.gui.fx.FXParametersController; import com.github.gtache.autosubtitle.gui.parameters.fx.FXParametersController;
import com.github.gtache.autosubtitle.gui.fx.FXSetupController; import com.github.gtache.autosubtitle.gui.setup.fx.FXSetupController;
import com.github.gtache.autosubtitle.gui.fx.FXSubtitlesController; import com.github.gtache.autosubtitle.gui.subtitles.fx.FXSubtitlesController;
import com.github.gtache.autosubtitle.gui.fx.FXWorkController; import com.github.gtache.autosubtitle.gui.work.fx.FXWorkController;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;