diff --git a/docs/elementIds.md b/docs/elementIds.md index 45b858c..da2b6a5 100644 --- a/docs/elementIds.md +++ b/docs/elementIds.md @@ -89,6 +89,9 @@ This does not include commonly used components (buttons, divider lines, commit a | `#menuOptionsContainerBG` | Container for Background option | | `#menuOptionsLabelBG` | Label for background option | | `#menuOptionsDirBG` | Container for background url/local path option | +| `#menuOptionsContainerUseThemeBG` | Container for forcing theme background option | +| `#menuOptionsLabelUseThemeBG` | Label for forcing theme background option | +| `#menuOptionsUseThemeBG` | Toggle forcing theme background button container | | `#menuOptionsContainerLang` | Container for language change option | | `#menuOptionsLabelLang` | Label for language change option | | `#menuOptionsSelectLang` | Container for language change select menu | diff --git a/src-tauri/lang/chs.json b/src-tauri/lang/chs.json index 7248992..b883f67 100644 --- a/src-tauri/lang/chs.json +++ b/src-tauri/lang/chs.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "随游戏自动启动 Grasscutter", "language": "选择语言", "background": "设置自定义背景(链接或文件)", + "use_theme_background": "使用所选主题提供的背景", "theme": "设置主题", "patch_rsa": "自动修改RSA", "use_proxy": "使用内置代理", diff --git a/src-tauri/lang/cht.json b/src-tauri/lang/cht.json index b7e28ef..ae35fb2 100644 --- a/src-tauri/lang/cht.json +++ b/src-tauri/lang/cht.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "伴隨遊戲一起啟動Grasscutter", "language": "語言", "background": "選擇自定義背景(網址或檔案)", + "use_theme_background": "使用所選主題提供的背景", "theme": "選擇主題", "patch_rsa": "自動修補RSA", "use_proxy": "使用內建代理伺服器", diff --git a/src-tauri/lang/de.json b/src-tauri/lang/de.json index 5b271e6..b5b9098 100644 --- a/src-tauri/lang/de.json +++ b/src-tauri/lang/de.json @@ -24,6 +24,7 @@ "grasscutter_with_game": "Grasscutter automatisch mit dem Spiel starten", "language": "Sprache auswählen", "background": "Benutzerdefinierten Hintergrund festlegen (link oder bild)", + "use_theme_background": "Verwenden Sie den vom ausgewählten Thema bereitgestellten Hintergrund", "theme": "Theme auswählen", "patch_rsa": "RSA automatisch patchen", "use_proxy": "Gebruik interne proxy", diff --git a/src-tauri/lang/en.json b/src-tauri/lang/en.json index 18a87a2..17d4390 100644 --- a/src-tauri/lang/en.json +++ b/src-tauri/lang/en.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Automatically launch Grasscutter with game", "language": "Select Language", "background": "Set Custom Background (link or image file)", + "use_theme_background": "Use the background supplied by selected theme", "theme": "Set Theme", "patch_rsa": "Automatically Patch RSA", "use_proxy": "Use Internal Proxy", diff --git a/src-tauri/lang/es.json b/src-tauri/lang/es.json index 3668450..40a51e2 100644 --- a/src-tauri/lang/es.json +++ b/src-tauri/lang/es.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Iniciar automáticamente Grasscutter con el juego", "language": "Seleccionar Idioma", "background": "Establecer Fondo Personalizado (link o archivo de imagen)", + "use_theme_background": "Usar fondo proporcionado por el tema seleccionado", "patch_rsa": "Parchear RSA automáticamente", "theme": "Establecer Tema", "use_proxy": "Usar proxy interno", diff --git a/src-tauri/lang/fr.json b/src-tauri/lang/fr.json index 4aa1c88..3d72ff0 100644 --- a/src-tauri/lang/fr.json +++ b/src-tauri/lang/fr.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Lancer Grasscutter automatiquement avec le jeu", "language": "Choisir la langue", "background": "Définir un arriere plan personnalisé (lien ou fichier image)", + "use_theme_background": "Utiliser l'arrière-plan fourni par le thème sélectionné", "theme": "Définir un theme", "patch_rsa": "Patcher automatiquement les clés RSA", "use_proxy": "Utiliser le proxy interne", diff --git a/src-tauri/lang/id.json b/src-tauri/lang/id.json index a28dedc..a31586c 100644 --- a/src-tauri/lang/id.json +++ b/src-tauri/lang/id.json @@ -24,6 +24,7 @@ "grasscutter_with_game": "Otomatis Menjalankan Grasscutter Dengan Game", "language": "Pilih Bahasa", "background": "Atur Kustom Latar Belakang (link atau gambar file)", + "use_theme_background": "Gunakan latar belakang yang disediakan oleh tema yang dipilih", "theme": "Atur Tema", "patch_rsa": "Automatically Patch RSA", "use_proxy": "Gunakan Proxy Internal", diff --git a/src-tauri/lang/it.json b/src-tauri/lang/it.json index 3bc22ad..be44e3e 100644 --- a/src-tauri/lang/it.json +++ b/src-tauri/lang/it.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Avvia automaticamente Grasscutter con il gioco", "language": "Imposta lingua", "background": "Imposta sfondo personalizzato (link o immagine)", + "use_theme_background": "Usa lo sfondo fornito dal tema selezionato", "theme": "Imposta tema", "patch_rsa": "Patch RSA automaticamente", "use_proxy": "Usa Proxy Interno", diff --git a/src-tauri/lang/ko.json b/src-tauri/lang/ko.json index 0411497..9bdf74c 100644 --- a/src-tauri/lang/ko.json +++ b/src-tauri/lang/ko.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "게임에서 자동으로 그래스커터 실행", "language": "언어 선택", "background": "사용자 지정 배경 설정(링크 또는 이미지 파일)", + "use_theme_background": "선택한 테마에서 제공하는 배경 사용", "theme": "테마 설정", "patch_rsa": "RSA 패치 자동 적용", "use_proxy": "내부 프록시 사용", diff --git a/src-tauri/lang/lv.json b/src-tauri/lang/lv.json index a383b29..3692813 100644 --- a/src-tauri/lang/lv.json +++ b/src-tauri/lang/lv.json @@ -23,6 +23,7 @@ "grasscutter_with_game": "Automātiski palaidiet Grasscutter ar spēli", "language": "Izvēlēties valodu", "background": "Iestatīt pielāgotu fonu (saite vai attēla fails)", + "use_theme_background": "Izmantojiet atlasītā motīva nodrošināto fonu", "theme": "Iestatīt tēmu", "patch_rsa": "Automātiski ielāpot RSA", "use_proxy": "Izmantot iekšējo starpniekserveri", diff --git a/src-tauri/lang/nl.json b/src-tauri/lang/nl.json index 34eed1c..81e96ca 100644 --- a/src-tauri/lang/nl.json +++ b/src-tauri/lang/nl.json @@ -24,6 +24,7 @@ "grasscutter_with_game": "Start Automatisch Grasscutter Met Spel", "language": "Selecteer Taal", "background": "Aangepaste Achtergrond Instellen (link of afbeeldingsbestand)", + "use_theme_background": "Gebruik de achtergrond geleverd door het geselecteerde thema", "theme": "Thema instellen", "patch_rsa": "RSA Automatisch Bijwerken", "use_proxy": "Gebruik Interne Proxy", diff --git a/src-tauri/lang/pl.json b/src-tauri/lang/pl.json index b03cab1..f3fab11 100644 --- a/src-tauri/lang/pl.json +++ b/src-tauri/lang/pl.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Automatycznie uruchom Grasscutter z grą", "language": "Wybierz Język", "background": "Ustaw własne tło (link lub plik graficzny)", + "use_theme_background": "Użyj tła dostarczonego przez wybrany motyw", "theme": "Ustaw motyw", "patch_rsa": "Automatycznie patchuj RSA", "use_proxy": "Używaj wewnętrznego Proxy", diff --git a/src-tauri/lang/pt-br.json b/src-tauri/lang/pt-br.json index 79a9fb9..36af05a 100644 --- a/src-tauri/lang/pt-br.json +++ b/src-tauri/lang/pt-br.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Iniciar automaticamente o Grasscutter com o Jogo", "language": "Selecionar Idioma", "background": "Definir Fundo Customizado (link ou arquivo de imagem)", + "use_theme_background": "Use o plano de fundo fornecido pelo tema selecionado", "theme": "Definir Tema", "patch_rsa": "Automaticamente Corrigir RSA", "use_proxy": "Usar Proxy Interno", diff --git a/src-tauri/lang/ru.json b/src-tauri/lang/ru.json index ee769cc..d243336 100644 --- a/src-tauri/lang/ru.json +++ b/src-tauri/lang/ru.json @@ -24,6 +24,7 @@ "grasscutter_with_game": "Автоматически запускать Grasscutter вместе с игрой", "language": "Установить язык", "background": "Установить свой фон (ссылка или файл)", + "use_theme_background": "Использовать фон из выбранной темы", "theme": "Установить тему", "patch_rsa": "Автоматическое исправление RSA", "use_proxy": "Использовать встроенный Прокси", diff --git a/src-tauri/lang/vi.json b/src-tauri/lang/vi.json index 73649d0..2138323 100644 --- a/src-tauri/lang/vi.json +++ b/src-tauri/lang/vi.json @@ -25,6 +25,7 @@ "grasscutter_with_game": "Tự động chạy Grasscutter cùng với game", "language": "Ngôn ngữ", "background": "Hình nền tùy chỉnh (liên kết hoặc tập tin hình ảnh)", + "use_theme_background": "Sử dụng nền được cung cấp bởi chủ đề đã chọn", "theme": "Giao diện", "patch_rsa": "Tự động vá RSA", "use_proxy": "Sử dụng proxy nội bộ", diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs index 93c7214..864146f 100644 --- a/src-tauri/src/config.rs +++ b/src-tauri/src/config.rs @@ -16,6 +16,7 @@ pub struct Configuration { pub last_port: Option, pub language: Option, pub custom_background: Option, + pub use_theme_background: Option, pub cert_generated: Option, pub theme: Option, pub https_enabled: Option, diff --git a/src/ui/components/menu/Options.tsx b/src/ui/components/menu/Options.tsx index 9c584dd..4b0163a 100644 --- a/src/ui/components/menu/Options.tsx +++ b/src/ui/components/menu/Options.tsx @@ -33,6 +33,7 @@ interface IState { bg_url_or_path: string themes: string[] theme: string + use_theme_background: boolean encryption: boolean patch_rsa: boolean use_internal_proxy: boolean @@ -64,6 +65,7 @@ export default class Options extends React.Component { bg_url_or_path: '', themes: ['default'], theme: '', + use_theme_background: false, encryption: false, patch_rsa: false, use_internal_proxy: false, @@ -119,6 +121,7 @@ export default class Options extends React.Component { bg_url_or_path: config.custom_background || '', themes: (await getThemeList()).map((t) => t.name), theme: config.theme || 'default', + use_theme_background: config.use_theme_background || false, encryption: encEnabled || false, patch_rsa: config.patch_rsa || false, use_internal_proxy: config.use_internal_proxy || false, @@ -538,6 +541,19 @@ export default class Options extends React.Component { + +