From beeef93480fae65840646e4e36aa888efe92579a Mon Sep 17 00:00:00 2001 From: Akshay Deep Date: Tue, 8 Mar 2016 19:54:57 +0530 Subject: tdf#98417, tdf#98539: DIALOG: Improvements to the Find & Replace dialog. Added Find Previous Button. Replaced backward checkbox with 'Replace Backward' from other options. Modified Dialog Layout as per the attachment in bug report. Removed vertical spacing in parent_container_box to reduce height of the dialog. Removed InfoBox from ReplaceAll functionality in writer, shifted it to SearchLabel. Attribute labels only show up when attribues are used in search, else they remain hidden. Change-Id: I0e9ded854fc2601524d6fc2a0ba5e9cb602e11a4 Reviewed-on: https://gerrit.libreoffice.org/23057 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- svx/uiconfig/ui/findreplacedialog.ui | 952 +++++++++++++++++++---------------- 1 file changed, 512 insertions(+), 440 deletions(-) (limited to 'svx/uiconfig') diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui index 1168e74afab3..976a23162e10 100644 --- a/svx/uiconfig/ui/findreplacedialog.ui +++ b/svx/uiconfig/ui/findreplacedialog.ui @@ -11,7 +11,7 @@ False vertical - 12 + 6 False @@ -55,12 +55,12 @@ - + True False True vertical - 12 + 6 True @@ -69,141 +69,206 @@ 0 none - + True False True 6 12 - + True False True 6 + 12 - + True False + center + 6 True - 6 - 12 - - _Find Next + True - True - True - True - True - True + False + center + True + True + + + True + + - 1 + 0 0 - - Find _All + + False + True + True + + + 0 + 1 + + + + + 1 + 0 + 2 + + + + + 80 + True + False + start + center + 0 + 0.40000000596046448 + _Find: + True + + + + + + 0 + 0 + + + + + False + True + True + 0 + 0.55000001192092896 + True + + + 1 + 2 + + + + + False + True + True + 0 + True + start + + + 1 + 4 + + + + + True + False + 12 + + + Ma_tch case True True - True + False True + 0 + True - 1 - 1 + False + True + 0 - + + Formatted display + True + True + False + 0 + True + + + False + True + 1 + + + + True False - center - True - + + Whole wor_ds only True - False - center - True - True - - - False - ● - - + True + False + True + 0 + True - 0 - 0 + False + True + 0 - + False True - True + _Entire cells + True - 0 - 1 + False + True + 1 - - 0 - 0 - 2 - - - - - 0 - 0 - - - - - True - False - True - vertical - - - False - True - True - 0 - 0.55000001192092896 - True - False True - 0 + 2 - - False + + All sheets + True + False True - True + True 0 - True + True False True - 1 + 3 - 0 - 1 + 1 + 3 @@ -212,7 +277,6 @@ - True False _Search For True @@ -236,125 +300,93 @@ 0 none - + True False True - 6 12 - + True False True + vertical 6 + 12 - + True False + center + 6 True - 6 - 12 - - _Replace + True - True - True - True + False + center + True + True + + + True + + - 1 + 0 0 - - Replace A_ll - True - True - True - True - - - 1 - 1 - - - - - True + False - center + True True - - - True - False - center - True - True - - - False - ● - - - - - 0 - 0 - - - - - False - True - True - - - 0 - 1 - - 0 - 0 - 2 + 1 - 0 + 1 0 + 2 - + + 80 True False - True - vertical - - - 1 - False - True - True - 0 - True - - - False - True - 0 - - + start + center + 0 + Re_place: + True + + + 0 - 1 + 0 + + + + + 1 + False + True + True + 0 + True + + + 1 + 2 @@ -363,7 +395,6 @@ - True False Re_place With True @@ -379,49 +410,166 @@ 1 + + + True + False + center + 10 + 10 + 15 + 12 + True + + + Find _All + True + True + True + True + + + False + True + 0 + + + + + Find Previous + True + True + True + True + + + False + True + 1 + + + + + _Find Next + True + True + True + True + True + True + + + False + True + 2 + + + + + _Replace + True + True + True + True + + + False + True + 3 + + + + + Replace A_ll + True + True + True + True + + + False + True + 4 + + + + + False + True + 2 + + False True + 6 True 0 none - + True False True 6 12 - + True False - True - 6 - 12 + 18 - - component button 1 - True - True - True + + False + Component Label + True + + + - 0 - 0 + False + True + 1 - - component button 2 - True - True - True + + True + False + 12 + + + component button 1 + True + True + True + + + False + True + 0 + + + + + component button 2 + True + True + True + + + False + True + 1 + + - 0 - 1 + False + True + 2 @@ -430,9 +578,8 @@ - True False - Component Label + Component Label True @@ -443,24 +590,26 @@ False True - 2 + 3 - + True False + 10 True - 6 - + True True + 6 1 1 True + True - + True False 6 @@ -479,6 +628,7 @@ True 6 12 + True C_urrent selection only @@ -509,21 +659,6 @@ 1 - - - Wil_dcards - True - False - True - True - 0 - True - - - 0 - 2 - - True @@ -576,13 +711,13 @@ 0 - 6 + 5 2 - - Bac_kwards + + Search for st_yles True False True @@ -592,27 +727,42 @@ 1 - 0 + 1 - - Search for st_yles + + Ignore diac_ritics CTL + True + True + False + True + 0 + True + + + 0 + 4 + + + + + Ig_nore kashida CTL + True True False - True True 0 True 1 - 1 + 4 - - Ignore diacritics CTL + + Match character _width True True False @@ -621,16 +771,15 @@ True - 0 - 5 + 1 + 2 - + True False - 6 - 12 + 12 S_imilarity search @@ -640,13 +789,11 @@ True 0 True - - - - 0 - 0 + False + True + 0 @@ -655,31 +802,33 @@ True True True - start + end True True - 1 - 0 + False + True + 1 0 - 3 + 2 - + True False + 12 - - Comments - True + + _Sounds like (Japanese) True False + True True 0 True @@ -691,14 +840,15 @@ - - All sheets + + Sounds... True - False + True True + end + 25 + True True - 0 - True False @@ -708,86 +858,65 @@ - 1 - 2 + 0 + 3 - + True False - 6 - 12 - - Sounds like (Japanese) + + Wil_dcards True False True True 0 True - - - - 0 - 0 + False + True + 0 - - Sounds... + + _Comments + True True - True - True - start - True + False True - - - + 0 + True - 1 - 0 + False + True + 1 - - 0 - 4 - - - - - Match character width - True - True - False - True - 0 - True - 1 - 4 + 3 - - Ig_nore kashida CTL - True + + Replace Bac_kwards True False + True True 0 True 1 - 5 + 0 @@ -801,32 +930,44 @@ False True - start 6 12 + True - - False - True - 0 - Search i_n: - True - calcsearchin - - - 0 - 0 - - - - + + True False - True - - Formulas - Values - Notes - + 15 + + + False + True + 0 + Search i_n: + True + + + False + True + 0 + + + + + False + True + + Formulas + Values + Notes + + + + False + True + 1 + + 1 @@ -834,62 +975,82 @@ - + + True False - True - 0 - Search direction: - True - calcsearchin + 4 + 15 + + + False + True + 0 + Direction: + True + + + False + True + 0 + + + + + True + False + 15 + + + Ro_ws + True + False + True + True + 0 + True + True + + + + + + False + True + 0 + + + + + Colu_mns + True + False + True + True + 0 + True + + + + + + False + True + 1 + + + + + False + True + 1 + + 0 - 1 - - - - - Ro_ws - True - False - True - True - 0 - True - True - cols - - - - - - 1 - 1 - - - - - Colu_mns - True - False - True - True - 0 - True - True - rows - - - - - - 1 - 2 + 0 - - - False @@ -905,91 +1066,15 @@ True False + start Other _options True + + + - - 0 - 1 - - - - - True - False - 12 - - - Ma_tch case - True - True - False - True - 0 - True - - - 0 - 0 - - - - - Formatted display - True - True - False - False - 0 - True - - - 1 - 0 - - - - - True - False - - - Whole wor_ds only - True - True - False - True - 0 - True - - - False - True - 0 - - - - - False - True - _Entire cells - True - - - False - True - 1 - - - - - 2 - 0 - - - 0 0 @@ -1016,20 +1101,7 @@ close - - - - - - - - True - - - - - -- cgit v1.2.3