From 7ea1499563363302eaf3e4d6c5b6db3a92f8647b Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Mon, 19 Feb 2018 12:59:48 +0200 Subject: Make too long tooltips multi-line Task-number: QT3DS-1154 Change-Id: I691667d1f7ffd709ee9537e4ad35bcf129c91fe6 Reviewed-by: Miikka Heikkinen --- Studio/Content/Behavior Library/CameraLookAt.qml | 2 +- Studio/Content/Behavior Library/CopyTransform.qml | 2 +- Studio/Content/Effect Library/Bloom.effect | 2 +- Studio/Content/Effect Library/Brush Strokes.effect | 2 +- .../Effect Library/ChromaticAberration.effect | 8 +- Studio/Content/Effect Library/ColorMaster.effect | 2 +- Studio/Content/Effect Library/Corona.effect | 6 +- .../Effect Library/Depth Of Field Bokeh.effect | 10 +- .../Effect Library/Depth Of Field HQ Blur.effect | 6 +- .../Effect Library/Distortion Ripple.effect | 4 +- Studio/Content/Effect Library/Edge Detect.effect | 2 +- .../Effect Library/FullScreenTextureOverlay.effect | 2 +- Studio/Content/Effect Library/Gaussian Blur.effect | 2 +- .../Content/Effect Library/HDRBloomTonemap.effect | 6 +- Studio/Content/Effect Library/LightTable.effect | 14 +- Studio/Content/Effect Library/Motion Blur.effect | 2 +- .../Content/Effect Library/Screen Space AO.effect | 6 +- Studio/Content/Effect Library/Sepia.effect | 2 +- .../Effect Library/Stylize - Scatter.effect | 4 +- Studio/Content/Effect Library/Tilt Shift.effect | 12 +- .../Material Library/aluminium_anodized.material | 2 +- .../aluminium_anodized_emissive.material | 2 +- Studio/Content/Material Library/asphalt.material | 2 +- .../Material Library/bamboo_natural_matte.material | 2 +- .../bamboo_natural_matte_emissive.material | 2 +- .../Content/Material Library/carbon_fiber.material | 8 +- .../carbon_fiber_emissive.material | 8 +- Studio/Content/Material Library/concrete.material | 2 +- Studio/Content/Material Library/copper.material | 2 +- .../leather_smoothed_black.material | 2 +- .../Content/Material Library/mesh_fence.material | 2 +- .../Material Library/metal_mesh_fine.material | 2 +- .../Material Library/paper_artistic.material | 2 +- .../Content/Material Library/paper_office.material | 2 +- .../plastic_structured_red.material | 2 +- .../plastic_structured_red_emissive.material | 2 +- Studio/Content/Material Library/porcelain.material | 2 +- .../Content/Material Library/powder_coat.material | 4 +- .../Material Library/powder_coat_emissive.material | 4 +- .../Material Library/rubber_studded_black.material | 4 +- .../rubber_studded_emissive.material | 4 +- .../Material Library/thin_glass_frosted.material | 6 +- .../thin_glass_frosted_sp.material | 2 +- .../thin_glass_refractive.material | 2 +- .../Content/Material Library/walnut_matte.material | 2 +- .../Palettes/Inspector/InspectorControlModel.cpp | 3 + .../res/DataModelMetadata/en-us/MetaData.xml | 172 ++++++++++----------- 47 files changed, 174 insertions(+), 171 deletions(-) diff --git a/Studio/Content/Behavior Library/CameraLookAt.qml b/Studio/Content/Behavior Library/CameraLookAt.qml index a4e1fffc..087ddac6 100644 --- a/Studio/Content/Behavior Library/CameraLookAt.qml +++ b/Studio/Content/Behavior Library/CameraLookAt.qml @@ -50,7 +50,7 @@ /*[[ - + diff --git a/Studio/Content/Behavior Library/CopyTransform.qml b/Studio/Content/Behavior Library/CopyTransform.qml index 451525b3..576459c4 100644 --- a/Studio/Content/Behavior Library/CopyTransform.qml +++ b/Studio/Content/Behavior Library/CopyTransform.qml @@ -81,7 +81,7 @@ - + ]]*/ diff --git a/Studio/Content/Effect Library/Bloom.effect b/Studio/Content/Effect Library/Bloom.effect index dda390e5..97f9c12a 100644 --- a/Studio/Content/Effect Library/Bloom.effect +++ b/Studio/Content/Effect Library/Bloom.effect @@ -1,7 +1,7 @@ - + diff --git a/Studio/Content/Effect Library/ChromaticAberration.effect b/Studio/Content/Effect Library/ChromaticAberration.effect index 3695cf7c..6b553e74 100644 --- a/Studio/Content/Effect Library/ChromaticAberration.effect +++ b/Studio/Content/Effect Library/ChromaticAberration.effect @@ -2,9 +2,9 @@ - - - + + + @@ -53,4 +53,4 @@ void frag() - \ No newline at end of file + diff --git a/Studio/Content/Effect Library/ColorMaster.effect b/Studio/Content/Effect Library/ColorMaster.effect index efb6ab05..20e5b4db 100644 --- a/Studio/Content/Effect Library/ColorMaster.effect +++ b/Studio/Content/Effect Library/ColorMaster.effect @@ -4,7 +4,7 @@ - + diff --git a/Studio/Content/Effect Library/Corona.effect b/Studio/Content/Effect Library/Corona.effect index bdbd1b72..1097ceb6 100644 --- a/Studio/Content/Effect Library/Corona.effect +++ b/Studio/Content/Effect Library/Corona.effect @@ -4,11 +4,11 @@ - + - + @@ -94,4 +94,4 @@ void frag () - \ No newline at end of file + diff --git a/Studio/Content/Effect Library/Depth Of Field Bokeh.effect b/Studio/Content/Effect Library/Depth Of Field Bokeh.effect index c1278684..c7152583 100644 --- a/Studio/Content/Effect Library/Depth Of Field Bokeh.effect +++ b/Studio/Content/Effect Library/Depth Of Field Bokeh.effect @@ -1,14 +1,14 @@ - - + + - - + + - + diff --git a/Studio/Content/Effect Library/Depth Of Field HQ Blur.effect b/Studio/Content/Effect Library/Depth Of Field HQ Blur.effect index 71250722..6649bf7f 100644 --- a/Studio/Content/Effect Library/Depth Of Field HQ Blur.effect +++ b/Studio/Content/Effect Library/Depth Of Field HQ Blur.effect @@ -1,9 +1,9 @@ - - - + + + diff --git a/Studio/Content/Effect Library/Distortion Ripple.effect b/Studio/Content/Effect Library/Distortion Ripple.effect index b6d4b873..0929be16 100644 --- a/Studio/Content/Effect Library/Distortion Ripple.effect +++ b/Studio/Content/Effect Library/Distortion Ripple.effect @@ -6,7 +6,7 @@ - + @@ -47,4 +47,4 @@ void frag() - \ No newline at end of file + diff --git a/Studio/Content/Effect Library/Edge Detect.effect b/Studio/Content/Effect Library/Edge Detect.effect index 3fe10fed..2b200d00 100644 --- a/Studio/Content/Effect Library/Edge Detect.effect +++ b/Studio/Content/Effect Library/Edge Detect.effect @@ -2,7 +2,7 @@ - + diff --git a/Studio/Content/Effect Library/FullScreenTextureOverlay.effect b/Studio/Content/Effect Library/FullScreenTextureOverlay.effect index 7c8325fe..42be3f37 100644 --- a/Studio/Content/Effect Library/FullScreenTextureOverlay.effect +++ b/Studio/Content/Effect Library/FullScreenTextureOverlay.effect @@ -1,7 +1,7 @@ - + diff --git a/Studio/Content/Effect Library/Gaussian Blur.effect b/Studio/Content/Effect Library/Gaussian Blur.effect index f76d505d..958d9fe7 100644 --- a/Studio/Content/Effect Library/Gaussian Blur.effect +++ b/Studio/Content/Effect Library/Gaussian Blur.effect @@ -2,7 +2,7 @@ - + diff --git a/Studio/Content/Effect Library/HDRBloomTonemap.effect b/Studio/Content/Effect Library/HDRBloomTonemap.effect index c53ba0d0..4424393b 100644 --- a/Studio/Content/Effect Library/HDRBloomTonemap.effect +++ b/Studio/Content/Effect Library/HDRBloomTonemap.effect @@ -4,10 +4,10 @@ - - + + - \ No newline at end of file + diff --git a/Studio/Content/Effect Library/Motion Blur.effect b/Studio/Content/Effect Library/Motion Blur.effect index 1dff00b1..6d8d4cfd 100644 --- a/Studio/Content/Effect Library/Motion Blur.effect +++ b/Studio/Content/Effect Library/Motion Blur.effect @@ -2,7 +2,7 @@ - + diff --git a/Studio/Content/Effect Library/Screen Space AO.effect b/Studio/Content/Effect Library/Screen Space AO.effect index f7128915..84da723e 100644 --- a/Studio/Content/Effect Library/Screen Space AO.effect +++ b/Studio/Content/Effect Library/Screen Space AO.effect @@ -2,9 +2,9 @@ - + - + @@ -87,4 +87,4 @@ void frag( void ) - \ No newline at end of file + diff --git a/Studio/Content/Effect Library/Sepia.effect b/Studio/Content/Effect Library/Sepia.effect index b3b92dee..3129e338 100644 --- a/Studio/Content/Effect Library/Sepia.effect +++ b/Studio/Content/Effect Library/Sepia.effect @@ -6,7 +6,7 @@ - + diff --git a/Studio/Content/Effect Library/Stylize - Scatter.effect b/Studio/Content/Effect Library/Stylize - Scatter.effect index b30df215..9d37b1c8 100644 --- a/Studio/Content/Effect Library/Stylize - Scatter.effect +++ b/Studio/Content/Effect Library/Stylize - Scatter.effect @@ -4,8 +4,8 @@