diff --git a/AssetEditor/Language_Cn.json b/AssetEditor/Language_Cn.json index bd28f99bc..2c8364b02 100644 --- a/AssetEditor/Language_Cn.json +++ b/AssetEditor/Language_Cn.json @@ -12,7 +12,6 @@ "SettingsWindow.OnlyLoadLod0": "仅为参考 Mesh 加载 Lod0", "SettingsWindow.GridSize": "网格大小", "SettingsWindow.VertexSelectionColour": "顶点选择颜色", - "SettingsWindow.AudioModding": "音频 Mod", "SettingsWindow.SaveButton": "保存", "UpdaterWindow.Title": "更新器", @@ -101,8 +100,6 @@ "SettingsWindow.VertexSelectionColourTooltip": "选中顶点的十六进制颜色（例如 #FF7800）", "SettingsWindow.GameFiles": "游戏文件", "SettingsWindow.GameDataPathHint": "浏览游戏数据位置，例如 \"C:\\SteamLibrary\\steamapps\\common\\Total War WARHAMMER III\\data\"", - "SettingsWindow.WwiseCLI": "Wwise CLI", - "SettingsWindow.WwiseCliPathHint": "例如 \"C:\\Program Files (x86)\\Audiokinetic\\Wwise2019.2.15.7667\\Authoring\\x64\\Release\\bin\\WwiseCLI.exe\"", "MenuBar.File": "_文件", "MenuBar.File.NewPack": "新建 Pack", @@ -749,6 +746,7 @@ "MetadataEditor.NewEntryWindow.Title": "创建元数据条目", "WaveformVisualiser.Play": "播放", + "WaveformVisualiser.Pause": "暂停", "AudioProjectExplorer.DialogueEventFilters": "对话事件筛选", "AudioProjectExplorer.Watermark.DialogueEventTypeFilter": "选择对话事件类型筛选", diff --git a/AssetEditor/Language_En.json b/AssetEditor/Language_En.json index 368db562b..e87eaedc2 100644 --- a/AssetEditor/Language_En.json +++ b/AssetEditor/Language_En.json @@ -12,7 +12,6 @@ "SettingsWindow.OnlyLoadLod0": "Only load Lod0 for reference meshes", "SettingsWindow.GridSize": "Grid Size", "SettingsWindow.VertexSelectionColour": "Vertex Selection Colour", - "SettingsWindow.AudioModding": "Audio Modding", "SettingsWindow.SaveButton": "Save", "UpdaterWindow.Title": "Updater", @@ -101,8 +100,6 @@ "SettingsWindow.VertexSelectionColourTooltip": "Hex colour for selected vertices (e.g. #FF7800)", "SettingsWindow.GameFiles": "Game Files", "SettingsWindow.GameDataPathHint": "Browse for game data location e.g. \"C:\\SteamLibrary\\steamapps\\common\\Total War WARHAMMER III\\data\"", - "SettingsWindow.WwiseCLI": "Wwise CLI", - "SettingsWindow.WwiseCliPathHint": "e.g. \"C:\\Program Files (x86)\\Audiokinetic\\Wwise2019.2.15.7667\\Authoring\\x64\\Release\\bin\\WwiseCLI.exe\"", "MenuBar.File": "_File", "MenuBar.File.NewPack": "New Pack", @@ -749,6 +746,7 @@ "MetadataEditor.NewEntryWindow.Title": "Create MetaData entry", "WaveformVisualiser.Play": "Play", + "WaveformVisualiser.Pause": "Pause", "AudioProjectExplorer.DialogueEventFilters": "Dialogue Event Filters", "AudioProjectExplorer.Watermark.DialogueEventTypeFilter": "Select Dialogue Event Type Filter", diff --git a/AssetEditor/Language_Fr.json b/AssetEditor/Language_Fr.json index 23ccc7b60..0c4b6c1ee 100644 --- a/AssetEditor/Language_Fr.json +++ b/AssetEditor/Language_Fr.json @@ -11,7 +11,6 @@ "SettingsWindow.OnlyLoadLod0": "Charger uniquement le Lod0 pour les maillages de référence", "SettingsWindow.GridSize": "Taille de la grille", "SettingsWindow.VertexSelectionColour": "Couleur de sélection des sommets", - "SettingsWindow.AudioModding": "Modding audio", "SettingsWindow.SaveButton": "Enregistrer", "UpdaterWindow.Title": "Mise à jour", @@ -36,5 +35,8 @@ "PackFileCache.InvalidReason.Corrupted": "Cache for {0} is corrupted and will be rebuilt.", "PackFileCache.BuildingCache": "Building pack file cache for {0}. This may take some time, please wait...", "PackFileCache.BuildingCache.Title": "Building Cache", - "PackFileCache.Description": "The cache allows faster startup times and reduces memory usage by storing pre-processed game file data on disk." + "PackFileCache.Description": "The cache allows faster startup times and reduces memory usage by storing pre-processed game file data on disk.", + + "WaveformVisualiser.Play": "Lecture", + "WaveformVisualiser.Pause": "Pause" } \ No newline at end of file diff --git a/AssetEditor/ViewModels/SettingsViewModel.cs b/AssetEditor/ViewModels/SettingsViewModel.cs index 850b442c7..78786bdac 100644 --- a/AssetEditor/ViewModels/SettingsViewModel.cs +++ b/AssetEditor/ViewModels/SettingsViewModel.cs @@ -35,7 +35,6 @@ partial class SettingsViewModel : ObservableObject [ObservableProperty] private GameTypeEnum _currentGame; [ObservableProperty] private bool _loadCaPacksByDefault; [ObservableProperty] private bool _showCAWemFiles; - [ObservableProperty] private string _wwisePath; [ObservableProperty] private bool _onlyLoadLod0ForReferenceMeshes; [ObservableProperty] private CameraControlMode _selectedCameraMode; @@ -73,7 +72,6 @@ public SettingsViewModel(ApplicationSettingsService settingsService, Localizatio Path = _settingsService.CurrentSettings.GameDirectories.FirstOrDefault(x => x.Game == game.Type)?.Path }); } - WwisePath = _settingsService.CurrentSettings.WwisePath; } @@ -95,22 +93,11 @@ private void Save() foreach (var item in GameDirectores) _settingsService.CurrentSettings.GameDirectories.Add(new ApplicationSettings.GamePathPair(item.GameType, item.Path)); - _settingsService.CurrentSettings.WwisePath = WwisePath; _localizationManager.LoadLanguage(SelectedLanguage); _settingsService.Save(); MessageBox.Show("Please restart the tool after updating settings!"); } - - [RelayCommand] - private void Browse() - { - var dialog = new OpenFileDialog(); - dialog.Filter = "Executable files (*.exe)|*.exe"; - dialog.Multiselect = false; - if (dialog.ShowDialog() == DialogResult.OK) - WwisePath = dialog.FileName; - } } class GamePathItem : NotifyPropertyChangedImpl diff --git a/AssetEditor/Views/Settings/SettingsView.xaml b/AssetEditor/Views/Settings/SettingsView.xaml index 4d74aa71f..a976b36bd 100644 --- a/AssetEditor/Views/Settings/SettingsView.xaml +++ b/AssetEditor/Views/Settings/SettingsView.xaml @@ -30,8 +30,6 @@ - - @@ -166,26 +164,5 @@ - - - - - - - - - - - - - - - - - - -