asset workspace progress
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package p.studio.projects;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import p.packer.PackerProjectContext;
|
||||
import p.packer.messages.PackerProjectContext;
|
||||
|
||||
import java.nio.file.Path;
|
||||
|
||||
|
||||
@@ -132,6 +132,10 @@ public enum I18n {
|
||||
ASSETS_LABEL_BUILD_PARTICIPATION("assets.label.buildParticipation"),
|
||||
ASSETS_LABEL_ASSET_ID("assets.label.assetId"),
|
||||
ASSETS_LABEL_TYPE("assets.label.type"),
|
||||
ASSETS_TYPE_IMAGE_BANK("assets.type.imageBank"),
|
||||
ASSETS_TYPE_PALETTE_BANK("assets.type.paletteBank"),
|
||||
ASSETS_TYPE_SOUND_BANK("assets.type.soundBank"),
|
||||
ASSETS_TYPE_UNKNOWN("assets.type.unknown"),
|
||||
ASSETS_LABEL_LOCATION("assets.label.location"),
|
||||
ASSETS_LABEL_BANK("assets.label.bank"),
|
||||
ASSETS_LABEL_TARGET_LOCATION("assets.label.targetLocation"),
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceStatus;
|
||||
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@ import javafx.scene.control.ScrollPane;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.assets.PackerAssetDetailsDTO;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.dtos.PackerAssetDetailsDTO;
|
||||
import p.packer.messages.GetAssetDetailsRequest;
|
||||
import p.studio.Container;
|
||||
import p.studio.events.StudioWorkspaceEventBus;
|
||||
|
||||
+7
-2
@@ -6,7 +6,7 @@ import javafx.scene.control.Label;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.studio.Container;
|
||||
import p.studio.projects.ProjectReference;
|
||||
import p.studio.utilities.i18n.I18n;
|
||||
@@ -79,7 +79,12 @@ public final class AssetDetailsUiSupport {
|
||||
}
|
||||
|
||||
public static String typeLabel(AssetFamilyCatalog assetFamily) {
|
||||
return assetFamily.displayName();
|
||||
return switch (assetFamily) {
|
||||
case IMAGE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_IMAGE_BANK);
|
||||
case PALETTE_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_PALETTE_BANK);
|
||||
case SOUND_BANK -> Container.i18n().text(I18n.ASSETS_TYPE_SOUND_BANK);
|
||||
case UNKNOWN -> Container.i18n().text(I18n.ASSETS_TYPE_UNKNOWN);
|
||||
};
|
||||
}
|
||||
|
||||
public static String typeChipTone(AssetFamilyCatalog assetFamily) {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets.details;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsStatus;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets.details;
|
||||
|
||||
import p.packer.assets.PackerAssetSummaryDTO;
|
||||
import p.packer.dtos.PackerAssetSummaryDTO;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation;
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package p.studio.workspaces.assets.details.contract;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.assets.OutputCodecCatalog;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@ import javafx.scene.control.TextField;
|
||||
import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.assets.OutputCodecCatalog;
|
||||
import p.packer.assets.PackerCodecConfigurationFieldDTO;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
import p.packer.dtos.PackerCodecConfigurationFieldDTO;
|
||||
import p.studio.Container;
|
||||
import p.studio.controls.forms.StudioFormActionBar;
|
||||
import p.studio.controls.forms.StudioFormMode;
|
||||
|
||||
@@ -10,8 +10,8 @@ import javafx.scene.control.ToggleButton;
|
||||
import javafx.scene.layout.FlowPane;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.assets.PackerAssetSummaryDTO;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.dtos.PackerAssetSummaryDTO;
|
||||
import p.packer.messages.ListAssetsRequest;
|
||||
import p.studio.Container;
|
||||
import p.studio.events.StudioWorkspaceEventBus;
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import javafx.scene.layout.HBox;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.Region;
|
||||
import javafx.scene.layout.VBox;
|
||||
import p.packer.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.studio.Container;
|
||||
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent;
|
||||
import p.studio.events.StudioWorkspaceEventBus;
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package p.studio.workspaces.assets.messages;
|
||||
|
||||
import p.packer.assets.PackerCodecConfigurationFieldDTO;
|
||||
import p.packer.assets.OutputCodecCatalog;
|
||||
import p.packer.dtos.PackerCodecConfigurationFieldDTO;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.List;
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
package p.studio.workspaces.assets.messages;
|
||||
|
||||
import p.packer.assets.AssetFamilyCatalog;
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.AssetReference;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Objects;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets.messages;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.AssetReference;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets.messages.events;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.studio.events.StudioEvent;
|
||||
|
||||
public record StudioAssetsRefreshRequestedEvent(
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package p.studio.workspaces.assets.messages.events;
|
||||
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.studio.events.StudioEvent;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
+8
-7
@@ -17,16 +17,17 @@ import javafx.stage.DirectoryChooser;
|
||||
import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.Window;
|
||||
import p.packer.PackerOperationStatus;
|
||||
import p.packer.assets.AssetFamilyCatalog;
|
||||
import p.packer.assets.AssetReference;
|
||||
import p.packer.assets.OutputCodecCatalog;
|
||||
import p.packer.assets.OutputFormatCatalog;
|
||||
import p.packer.messages.PackerOperationStatus;
|
||||
import p.packer.messages.assets.AssetFamilyCatalog;
|
||||
import p.packer.messages.AssetReference;
|
||||
import p.packer.messages.assets.OutputCodecCatalog;
|
||||
import p.packer.messages.assets.OutputFormatCatalog;
|
||||
import p.packer.messages.CreateAssetRequest;
|
||||
import p.packer.messages.CreateAssetResult;
|
||||
import p.studio.Container;
|
||||
import p.studio.projects.ProjectReference;
|
||||
import p.studio.utilities.i18n.I18n;
|
||||
import p.studio.workspaces.assets.details.AssetDetailsUiSupport;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
@@ -122,14 +123,14 @@ public final class AddAssetWizard {
|
||||
@Override
|
||||
protected void updateItem(AssetFamilyCatalog item, boolean empty) {
|
||||
super.updateItem(item, empty);
|
||||
setText(empty || item == null ? null : item.displayName());
|
||||
setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(item));
|
||||
}
|
||||
});
|
||||
assetFamilyCombo.setButtonCell(new javafx.scene.control.ListCell<>() {
|
||||
@Override
|
||||
protected void updateItem(AssetFamilyCatalog item, boolean empty) {
|
||||
super.updateItem(item, empty);
|
||||
setText(empty || item == null ? null : item.displayName());
|
||||
setText(empty || item == null ? null : AssetDetailsUiSupport.typeLabel(item));
|
||||
}
|
||||
});
|
||||
assetFamilyCombo.valueProperty().addListener((ignored, oldValue, newValue) -> {
|
||||
|
||||
@@ -122,6 +122,10 @@ assets.label.registration=Registration
|
||||
assets.label.buildParticipation=Build Participation
|
||||
assets.label.assetId=Asset ID
|
||||
assets.label.type=Type
|
||||
assets.type.imageBank=Image Bank
|
||||
assets.type.paletteBank=Palette Bank
|
||||
assets.type.soundBank=Sound Bank
|
||||
assets.type.unknown=Unknown
|
||||
assets.label.location=Location
|
||||
assets.label.bank=Bank
|
||||
assets.label.targetLocation=Target Location
|
||||
|
||||
Reference in New Issue
Block a user