diff --git a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp index 6a6fae11d9..08ebb119ef 100644 --- a/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/AdvancedWidget.cpp @@ -312,36 +312,29 @@ void AdvancedWidget::AddDescriptions() "unchecked."); #endif - m_enable_wireframe->SetDescription(QString::fromStdString(TR_WIREFRAME_DESCRIPTION)); - m_show_statistics->SetDescription(QString::fromStdString(TR_SHOW_STATS_DESCRIPTION)); - m_enable_format_overlay->SetDescription(QString::fromStdString(TR_TEXTURE_FORMAT_DESCRIPTION)); - m_enable_api_validation->SetDescription(QString::fromStdString(TR_VALIDATION_LAYER_DESCRIPTION)); - m_dump_textures->SetDescription(QString::fromStdString(TR_DUMP_TEXTURE_DESCRIPTION)); - m_dump_mip_textures->SetDescription(QString::fromStdString(TR_DUMP_MIP_TEXTURE_DESCRIPTION)); - m_dump_base_textures->SetDescription(QString::fromStdString(TR_DUMP_BASE_TEXTURE_DESCRIPTION)); - m_load_custom_textures->SetDescription( - QString::fromStdString(TR_LOAD_CUSTOM_TEXTURE_DESCRIPTION)); - m_prefetch_custom_textures->SetDescription( - QString::fromStdString(TR_CACHE_CUSTOM_TEXTURE_DESCRIPTION)); - m_dump_efb_target->SetDescription(QString::fromStdString(TR_DUMP_EFB_DESCRIPTION)); - m_disable_vram_copies->SetDescription(QString::fromStdString(TR_DISABLE_VRAM_COPIES_DESCRIPTION)); - m_use_fullres_framedumps->SetDescription( - QString::fromStdString(TR_INTERNAL_RESOLUTION_FRAME_DUMPING_DESCRIPTION)); + m_enable_wireframe->SetDescription(tr(TR_WIREFRAME_DESCRIPTION)); + m_show_statistics->SetDescription(tr(TR_SHOW_STATS_DESCRIPTION)); + m_enable_format_overlay->SetDescription(tr(TR_TEXTURE_FORMAT_DESCRIPTION)); + m_enable_api_validation->SetDescription(tr(TR_VALIDATION_LAYER_DESCRIPTION)); + m_dump_textures->SetDescription(tr(TR_DUMP_TEXTURE_DESCRIPTION)); + m_dump_mip_textures->SetDescription(tr(TR_DUMP_MIP_TEXTURE_DESCRIPTION)); + m_dump_base_textures->SetDescription(tr(TR_DUMP_BASE_TEXTURE_DESCRIPTION)); + m_load_custom_textures->SetDescription(tr(TR_LOAD_CUSTOM_TEXTURE_DESCRIPTION)); + m_prefetch_custom_textures->SetDescription(tr(TR_CACHE_CUSTOM_TEXTURE_DESCRIPTION)); + m_dump_efb_target->SetDescription(tr(TR_DUMP_EFB_DESCRIPTION)); + m_disable_vram_copies->SetDescription(tr(TR_DISABLE_VRAM_COPIES_DESCRIPTION)); + m_use_fullres_framedumps->SetDescription(tr(TR_INTERNAL_RESOLUTION_FRAME_DUMPING_DESCRIPTION)); #ifdef HAVE_FFMPEG - m_dump_use_ffv1->SetDescription(QString::fromStdString(TR_USE_FFV1_DESCRIPTION)); + m_dump_use_ffv1->SetDescription(tr(TR_USE_FFV1_DESCRIPTION)); #endif - m_enable_cropping->SetDescription(QString::fromStdString(TR_CROPPING_DESCRIPTION)); - m_enable_prog_scan->SetDescription(QString::fromStdString(TR_PROGRESSIVE_SCAN_DESCRIPTION)); - m_enable_freelook->SetDescription(QString::fromStdString(TR_FREE_LOOK_DESCRIPTION)); + m_enable_cropping->SetDescription(tr(TR_CROPPING_DESCRIPTION)); + m_enable_prog_scan->SetDescription(tr(TR_PROGRESSIVE_SCAN_DESCRIPTION)); + m_enable_freelook->SetDescription(tr(TR_FREE_LOOK_DESCRIPTION)); m_freelook_control_type->SetTitle(tr("Free Look Control Type")); - m_freelook_control_type->SetDescription( - QString::fromStdString(TR_FREE_LOOK_CONTROL_TYPE_DESCRIPTION)); - m_backend_multithreading->SetDescription( - QString::fromStdString(TR_BACKEND_MULTITHREADING_DESCRIPTION)); + m_freelook_control_type->SetDescription(tr(TR_FREE_LOOK_CONTROL_TYPE_DESCRIPTION)); + m_backend_multithreading->SetDescription(tr(TR_BACKEND_MULTITHREADING_DESCRIPTION)); #ifdef _WIN32 - m_borderless_fullscreen->SetDescription( - QString::fromStdString(TR_BORDERLESS_FULLSCREEN_DESCRIPTION)); + m_borderless_fullscreen->SetDescription(tr(TR_BORDERLESS_FULLSCREEN_DESCRIPTION)); #endif - m_defer_efb_access_invalidation->SetDescription( - QString::fromStdString(TR_DEFER_EFB_ACCESS_INVALIDATION_DESCRIPTION)); + m_defer_efb_access_invalidation->SetDescription(tr(TR_DEFER_EFB_ACCESS_INVALIDATION_DESCRIPTION)); } diff --git a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp index c3f1bca409..a1be828d3f 100644 --- a/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/EnhancementsWidget.cpp @@ -374,45 +374,43 @@ void EnhancementsWidget::AddDescriptions() "checked."); m_ir_combo->SetTitle(tr("Internal Resolution")); - m_ir_combo->SetDescription(QString::fromStdString(TR_INTERNAL_RESOLUTION_DESCRIPTION)); + m_ir_combo->SetDescription(tr(TR_INTERNAL_RESOLUTION_DESCRIPTION)); m_aa_combo->SetTitle(tr("Anti-Aliasing")); - m_aa_combo->SetDescription(QString::fromStdString(TR_ANTIALIAS_DESCRIPTION)); + m_aa_combo->SetDescription(tr(TR_ANTIALIAS_DESCRIPTION)); m_af_combo->SetTitle(tr("Anisotropic Filtering")); - m_af_combo->SetDescription(QString::fromStdString(TR_ANISOTROPIC_FILTERING_DESCRIPTION)); + m_af_combo->SetDescription(tr(TR_ANISOTROPIC_FILTERING_DESCRIPTION)); m_pp_effect->SetTitle(tr("Post-Processing Effect")); - m_pp_effect->SetDescription(QString::fromStdString(TR_POSTPROCESSING_DESCRIPTION)); + m_pp_effect->SetDescription(tr(TR_POSTPROCESSING_DESCRIPTION)); - m_scaled_efb_copy->SetDescription(QString::fromStdString(TR_SCALED_EFB_COPY_DESCRIPTION)); + m_scaled_efb_copy->SetDescription(tr(TR_SCALED_EFB_COPY_DESCRIPTION)); - m_per_pixel_lighting->SetDescription(QString::fromStdString(TR_PER_PIXEL_LIGHTING_DESCRIPTION)); + m_per_pixel_lighting->SetDescription(tr(TR_PER_PIXEL_LIGHTING_DESCRIPTION)); - m_widescreen_hack->SetDescription(QString::fromStdString(TR_WIDESCREEN_HACK_DESCRIPTION)); + m_widescreen_hack->SetDescription(tr(TR_WIDESCREEN_HACK_DESCRIPTION)); - m_disable_fog->SetDescription(QString::fromStdString(TR_REMOVE_FOG_DESCRIPTION)); + m_disable_fog->SetDescription(tr(TR_REMOVE_FOG_DESCRIPTION)); - m_force_24bit_color->SetDescription(QString::fromStdString(TR_FORCE_24BIT_DESCRIPTION)); + m_force_24bit_color->SetDescription(tr(TR_FORCE_24BIT_DESCRIPTION)); - m_force_texture_filtering->SetDescription( - QString::fromStdString(TR_FORCE_TEXTURE_FILTERING_DESCRIPTION)); + m_force_texture_filtering->SetDescription(tr(TR_FORCE_TEXTURE_FILTERING_DESCRIPTION)); - m_disable_copy_filter->SetDescription(QString::fromStdString(TR_DISABLE_COPY_FILTER_DESCRIPTION)); + m_disable_copy_filter->SetDescription(tr(TR_DISABLE_COPY_FILTER_DESCRIPTION)); - m_arbitrary_mipmap_detection->SetDescription( - QString::fromStdString(TR_ARBITRARY_MIPMAP_DETECTION_DESCRIPTION)); + m_arbitrary_mipmap_detection->SetDescription(tr(TR_ARBITRARY_MIPMAP_DETECTION_DESCRIPTION)); m_3d_mode->SetTitle(tr("Stereoscopic 3D Mode")); - m_3d_mode->SetDescription(QString::fromStdString(TR_3D_MODE_DESCRIPTION)); + m_3d_mode->SetDescription(tr(TR_3D_MODE_DESCRIPTION)); m_3d_depth->SetTitle(tr("Depth")); - m_3d_depth->SetDescription(QString::fromStdString(TR_3D_DEPTH_DESCRIPTION)); + m_3d_depth->SetDescription(tr(TR_3D_DEPTH_DESCRIPTION)); m_3d_convergence->SetTitle(tr("Convergence")); - m_3d_convergence->SetDescription(QString::fromStdString(TR_3D_CONVERGENCE_DESCRIPTION)); + m_3d_convergence->SetDescription(tr(TR_3D_CONVERGENCE_DESCRIPTION)); - m_3d_swap_eyes->SetDescription(QString::fromStdString(TR_3D_SWAP_EYES_DESCRIPTION)); + m_3d_swap_eyes->SetDescription(tr(TR_3D_SWAP_EYES_DESCRIPTION)); } void EnhancementsWidget::ConfigurePostProcessingShader() diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index 02b4f06230..cc5fbb387e 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -276,44 +276,39 @@ void GeneralWidget::AddDescriptions() "unsure, leave this unchecked."); m_backend_combo->SetTitle(tr("Backend")); - m_backend_combo->SetDescription(QString::fromStdString(TR_BACKEND_DESCRIPTION)); + m_backend_combo->SetDescription(tr(TR_BACKEND_DESCRIPTION)); m_adapter_combo->SetTitle(tr("Adapter")); - m_adapter_combo->SetDescription(QString::fromStdString(TR_ADAPTER_DESCRIPTION)); + m_adapter_combo->SetDescription(tr(TR_ADAPTER_DESCRIPTION)); m_aspect_combo->SetTitle(tr("Aspect Ratio")); - m_aspect_combo->SetDescription(QString::fromStdString(TR_ASPECT_RATIO_DESCRIPTION)); + m_aspect_combo->SetDescription(tr(TR_ASPECT_RATIO_DESCRIPTION)); - m_enable_vsync->SetDescription(QString::fromStdString(TR_VSYNC_DESCRIPTION)); + m_enable_vsync->SetDescription(tr(TR_VSYNC_DESCRIPTION)); - m_enable_fullscreen->SetDescription(QString::fromStdString(TR_FULLSCREEN_DESCRIPTION)); + m_enable_fullscreen->SetDescription(tr(TR_FULLSCREEN_DESCRIPTION)); - m_show_fps->SetDescription(QString::fromStdString(TR_SHOW_FPS_DESCRIPTION)); + m_show_fps->SetDescription(tr(TR_SHOW_FPS_DESCRIPTION)); - m_show_ping->SetDescription(QString::fromStdString(TR_SHOW_NETPLAY_PING_DESCRIPTION)); + m_show_ping->SetDescription(tr(TR_SHOW_NETPLAY_PING_DESCRIPTION)); - m_log_render_time->SetDescription(QString::fromStdString(TR_LOG_RENDERTIME_DESCRIPTION)); + m_log_render_time->SetDescription(tr(TR_LOG_RENDERTIME_DESCRIPTION)); - m_autoadjust_window_size->SetDescription(QString::fromStdString(TR_AUTOSIZE_DESCRIPTION)); + m_autoadjust_window_size->SetDescription(tr(TR_AUTOSIZE_DESCRIPTION)); - m_show_messages->SetDescription(QString::fromStdString(TR_SHOW_NETPLAY_MESSAGES_DESCRIPTION)); + m_show_messages->SetDescription(tr(TR_SHOW_NETPLAY_MESSAGES_DESCRIPTION)); - m_render_main_window->SetDescription(QString::fromStdString(TR_RENDER_TO_MAINWINDOW_DESCRIPTION)); + m_render_main_window->SetDescription(tr(TR_RENDER_TO_MAINWINDOW_DESCRIPTION)); - m_shader_compilation_mode[0]->SetDescription( - QString::fromStdString(TR_SHADER_COMPILE_SYNC_DESCRIPTION)); + m_shader_compilation_mode[0]->SetDescription(tr(TR_SHADER_COMPILE_SYNC_DESCRIPTION)); - m_shader_compilation_mode[1]->SetDescription( - QString::fromStdString(TR_SHADER_COMPILE_SYNC_UBER_DESCRIPTION)); + m_shader_compilation_mode[1]->SetDescription(tr(TR_SHADER_COMPILE_SYNC_UBER_DESCRIPTION)); - m_shader_compilation_mode[2]->SetDescription( - QString::fromStdString(TR_SHADER_COMPILE_ASYNC_UBER_DESCRIPTION)); + m_shader_compilation_mode[2]->SetDescription(tr(TR_SHADER_COMPILE_ASYNC_UBER_DESCRIPTION)); - m_shader_compilation_mode[3]->SetDescription( - QString::fromStdString(TR_SHADER_COMPILE_ASYNC_SKIP_DESCRIPTION)); + m_shader_compilation_mode[3]->SetDescription(tr(TR_SHADER_COMPILE_ASYNC_SKIP_DESCRIPTION)); - m_wait_for_shaders->SetDescription( - QString::fromStdString(TR_SHADER_COMPILE_BEFORE_START_DESCRIPTION)); + m_wait_for_shaders->SetDescription(tr(TR_SHADER_COMPILE_BEFORE_START_DESCRIPTION)); } void GeneralWidget::OnBackendChanged(const QString& backend_name) diff --git a/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp index 5719a1190b..6d1ac6b0c3 100644 --- a/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/HacksWidget.cpp @@ -278,23 +278,20 @@ void HacksWidget::AddDescriptions() "resolution is used.

If unsure, leave this " "unchecked."); - m_skip_efb_cpu->SetDescription(QString::fromStdString(TR_SKIP_EFB_CPU_ACCESS_DESCRIPTION)); - m_ignore_format_changes->SetDescription( - QString::fromStdString(TR_IGNORE_FORMAT_CHANGE_DESCRIPTION)); - m_store_efb_copies->SetDescription(QString::fromStdString(TR_STORE_EFB_TO_TEXTURE_DESCRIPTION)); - m_defer_efb_copies->SetDescription(QString::fromStdString(TR_DEFER_EFB_COPIES_DESCRIPTION)); + m_skip_efb_cpu->SetDescription(tr(TR_SKIP_EFB_CPU_ACCESS_DESCRIPTION)); + m_ignore_format_changes->SetDescription(tr(TR_IGNORE_FORMAT_CHANGE_DESCRIPTION)); + m_store_efb_copies->SetDescription(tr(TR_STORE_EFB_TO_TEXTURE_DESCRIPTION)); + m_defer_efb_copies->SetDescription(tr(TR_DEFER_EFB_COPIES_DESCRIPTION)); m_accuracy->SetTitle(tr("Texture Cache Accuracy")); - m_accuracy->SetDescription(QString::fromStdString(TR_ACCUARCY_DESCRIPTION)); - m_store_xfb_copies->SetDescription(QString::fromStdString(TR_STORE_XFB_TO_TEXTURE_DESCRIPTION)); - m_immediate_xfb->SetDescription(QString::fromStdString(TR_IMMEDIATE_XFB_DESCRIPTION)); - m_skip_duplicate_xfbs->SetDescription(QString::fromStdString(TR_SKIP_DUPLICATE_XFBS_DESCRIPTION)); - m_gpu_texture_decoding->SetDescription(QString::fromStdString(TR_GPU_DECODING_DESCRIPTION)); - m_fast_depth_calculation->SetDescription(QString::fromStdString(TR_FAST_DEPTH_CALC_DESCRIPTION)); - m_disable_bounding_box->SetDescription( - QString::fromStdString(TR_DISABLE_BOUNDINGBOX_DESCRIPTION)); - m_save_texture_cache_state->SetDescription( - QString::fromStdString(TR_SAVE_TEXTURE_CACHE_TO_STATE_DESCRIPTION)); - m_vertex_rounding->SetDescription(QString::fromStdString(TR_VERTEX_ROUNDING_DESCRIPTION)); + m_accuracy->SetDescription(tr(TR_ACCUARCY_DESCRIPTION)); + m_store_xfb_copies->SetDescription(tr(TR_STORE_XFB_TO_TEXTURE_DESCRIPTION)); + m_immediate_xfb->SetDescription(tr(TR_IMMEDIATE_XFB_DESCRIPTION)); + m_skip_duplicate_xfbs->SetDescription(tr(TR_SKIP_DUPLICATE_XFBS_DESCRIPTION)); + m_gpu_texture_decoding->SetDescription(tr(TR_GPU_DECODING_DESCRIPTION)); + m_fast_depth_calculation->SetDescription(tr(TR_FAST_DEPTH_CALC_DESCRIPTION)); + m_disable_bounding_box->SetDescription(tr(TR_DISABLE_BOUNDINGBOX_DESCRIPTION)); + m_save_texture_cache_state->SetDescription(tr(TR_SAVE_TEXTURE_CACHE_TO_STATE_DESCRIPTION)); + m_vertex_rounding->SetDescription(tr(TR_VERTEX_ROUNDING_DESCRIPTION)); } void HacksWidget::UpdateDeferEFBCopiesEnabled() diff --git a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp index 56aa3a9c7c..5f3abeb545 100644 --- a/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/SoftwareRendererWidget.cpp @@ -180,12 +180,12 @@ void SoftwareRendererWidget::AddDescriptions() "this unchecked."); m_backend_combo->SetTitle(tr("Backend")); - m_backend_combo->SetDescription(QString::fromStdString(TR_BACKEND_DESCRIPTION)); - m_show_statistics->SetDescription(QString::fromStdString(TR_SHOW_STATISTICS_DESCRIPTION)); - m_dump_textures->SetDescription(QString::fromStdString(TR_DUMP_TEXTURES_DESCRIPTION)); - m_dump_objects->SetDescription(QString::fromStdString(TR_DUMP_OBJECTS_DESCRIPTION)); - m_dump_tev_stages->SetDescription(QString::fromStdString(TR_DUMP_TEV_STAGES_DESCRIPTION)); - m_dump_tev_fetches->SetDescription(QString::fromStdString(TR_DUMP_TEV_FETCHES_DESCRIPTION)); + m_backend_combo->SetDescription(tr(TR_BACKEND_DESCRIPTION)); + m_show_statistics->SetDescription(tr(TR_SHOW_STATISTICS_DESCRIPTION)); + m_dump_textures->SetDescription(tr(TR_DUMP_TEXTURES_DESCRIPTION)); + m_dump_objects->SetDescription(tr(TR_DUMP_OBJECTS_DESCRIPTION)); + m_dump_tev_stages->SetDescription(tr(TR_DUMP_TEV_STAGES_DESCRIPTION)); + m_dump_tev_fetches->SetDescription(tr(TR_DUMP_TEV_FETCHES_DESCRIPTION)); } void SoftwareRendererWidget::OnEmulationStateChanged(bool running)