@@ -164,13 +165,13 @@ function SceneParserRatingField(
|
) =>
@@ -216,8 +217,14 @@ function SceneParserPerformerField(props: ISceneParserFieldProps) {
|
-
+ {
@@ -253,8 +260,14 @@ function SceneParserTagField(props: ISceneParserFieldProps) {
|
-
+ {
@@ -292,8 +305,13 @@ function SceneParserStudioField(props: ISceneParserFieldProps) {
|
-
+ {
maybeValueChanged(items[0].id);
@@ -390,7 +408,7 @@ export const SceneParserRow = (props: ISceneParserRowProps) => {
{props.showFields.get("Rating") && (
onRatingChanged(isSet, props.scene.rating.value ?? undefined)
@@ -403,7 +421,7 @@ export const SceneParserRow = (props: ISceneParserRowProps) => {
{props.showFields.get("Performers") && (
@@ -417,7 +435,7 @@ export const SceneParserRow = (props: ISceneParserRowProps) => {
{props.showFields.get("Tags") && (
@@ -431,7 +449,7 @@ export const SceneParserRow = (props: ISceneParserRowProps) => {
{props.showFields.get("Studio") && (
diff --git a/ui/v2.5/src/components/SceneFilenameParser/styles.scss b/ui/v2.5/src/components/SceneFilenameParser/styles.scss
index 8a9bef656..3f8640e8b 100644
--- a/ui/v2.5/src/components/SceneFilenameParser/styles.scss
+++ b/ui/v2.5/src/components/SceneFilenameParser/styles.scss
@@ -26,6 +26,12 @@
width: 30ch;
}
+ .parser-field-performers-select,
+ .parser-field-tags-select,
+ .parser-field-studio-select {
+ margin-bottom: 0.5rem;
+ }
+
.parser-field-tags {
width: 30ch;
}
diff --git a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
index 1610e253d..f04411be5 100644
--- a/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
+++ b/ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
@@ -2,8 +2,8 @@
import React from "react";
import ReactJWPlayer from "react-jw-player";
import * as GQL from "src/core/generated-graphql";
-import { useConfiguration } from "src/core/StashService";
import { JWUtils, ScreenUtils } from "src/utils";
+import { ConfigurationContext } from "src/hooks/Config";
import { ScenePlayerScrubber } from "./ScenePlayerScrubber";
import { Interactive } from "../../utils/interactive";
@@ -366,16 +366,12 @@ export class ScenePlayerImpl extends React.Component<
export const ScenePlayer: React.FC = (
props: IScenePlayerProps
) => {
- const config = useConfiguration();
+ const { configuration } = React.useContext(ConfigurationContext);
return (
);
};
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index afc555bbd..e2a94d109 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -4,7 +4,8 @@ import { useScenesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
import { Modal } from "src/components/Shared";
import { useToast } from "src/hooks";
-import { useIntl } from "react-intl";
+import { ConfigurationContext } from "src/hooks/Config";
+import { FormattedMessage, useIntl } from "react-intl";
interface IDeleteSceneDialogProps {
selected: GQL.SlimSceneDataFragment[];
@@ -31,8 +32,14 @@ export const DeleteScenesDialog: React.FC = (
{ count: props.selected.length, singularEntity, pluralEntity }
);
- const [deleteFile, setDeleteFile] = useState(false);
- const [deleteGenerated, setDeleteGenerated] = useState(true);
+ const { configuration: config } = React.useContext(ConfigurationContext);
+
+ const [deleteFile, setDeleteFile] = useState(
+ config?.defaults.deleteFile ?? false
+ );
+ const [deleteGenerated, setDeleteGenerated] = useState(
+ config?.defaults.deleteGenerated ?? true
+ );
const Toast = useToast();
const [deleteScene] = useScenesDestroy(getScenesDeleteInput());
@@ -60,6 +67,42 @@ export const DeleteScenesDialog: React.FC = (
props.onClose(true);
}
+ function maybeRenderDeleteFileAlert() {
+ if (!deleteFile) {
+ return;
+ }
+
+ return (
+
+
+
+
+
+ {props.selected.slice(0, 5).map((s) => (
+ - {s.path}
+ ))}
+ {props.selected.length > 5 && (
+
+ )}
+
+ {message}
+ {maybeRenderDeleteFileAlert()}
| 
Windows | 
MacOS| 
Linux | 
Docker
+:---:|:---:|:---:|:---:
+[Latest Release](https://github.com/stashapp/stash/releases/latest/download/stash-win.exe)