diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index e171e8784780..b291c1333b68 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -392,6 +392,9 @@ + diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index 635070376492..fc6d66f8662f 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -1,265 +1,46 @@ - + + + True + False + gtk-go-up + + + True + False + gtk-go-down + + True False vertical - 12 - + True False - 0 - none - 6 + vertical + 12 - + True False - 6 + 0 + none - - _Add... - False - True - True - True - False - True - - - False - True - 0 - - - - - _Change... - False - True - True - True - False - True - - - False - True - 1 - - - - - _Remove - False - True - True - True - False - True - - - False - True - 2 - - - - - - - True - False - Modify effect - - - - - - - - False - True - 0 - - - - - True - False - 0 - none - 6 - - - True - False - vertical - 6 - - + True False - True - 6 - 6 + 6 - - True - False - _Start: - True - end - - - 0 - 0 - 1 - 1 - - - - - True - False - _Direction: - True - end - - - 0 - 1 - 1 - 1 - - - - - True - False - Sp_eed: - True - end - - - 0 - 2 - 1 - 1 - - - - - True - False - 0 - 1 - True - - On click - With previous - After previous - - - - 1 - 0 - 1 - 1 - - - - - True - False - 6 - - - True - False - True - True - - - - - 1 - 1 - 1 - 1 - - - - - _... - False + + _Add... True True True - False True - - 2 - 1 - 1 - 1 - - - - - True - False - 0 - 1 - True - - - 1 - 2 - 1 - 1 - - - - - - - - - - - True - True - 0 - - - - - True - False - - - True - True - 1 - - - - - True - False - True - end - 6 - - - True - False - Change order: - False True @@ -267,14 +48,12 @@ - - gtk-go-up - False + + _Change... True True True - False - True + True False @@ -283,14 +62,12 @@ - - gtk-go-down - False + + _Remove True True True - False - True + True False @@ -299,119 +76,353 @@ - - False - True - 2 - + + + + True + False + Modify effect + + + + + + False + True + 0 + - - - True - False - Effect - - - - - - - - False - True - 1 - - - - - True - False - 0 - none - + True False - 6 + 0 + none - - _Play - False + + True + False + vertical + 6 + + + True + False + True + 6 + 6 + + + True + False + end + _Start: + True + + + 0 + 0 + 1 + 1 + + + + + True + False + end + _Direction: + True + + + 0 + 1 + 1 + 1 + + + + + True + False + end + Sp_eed: + True + + + 0 + 2 + 1 + 1 + + + + + True + False + True + 0 + 1 + + On click + With previous + After previous + + + + 1 + 0 + 1 + 1 + + + + + True + False + 6 + + + True + False + True + True + 0 + 1 + + + False + True + 0 + + + + + 1 + 1 + 1 + 1 + + + + + _... + True + True + True + True + + + 2 + 1 + 1 + 1 + + + + + True + False + True + 0 + 1 + + + 1 + 2 + 1 + 1 + + + + + + + + + + + True + True + 0 + + + + + True + True + + + + + + True + True + 1 + + + + + True + False + end + True + 6 + + + True + False + Change order: + + + False + True + 0 + + + + + True + True + True + image1 + + + False + True + 1 + + + + + True + True + True + image2 + + + False + True + 2 + + + + + False + True + 2 + + + + + + + True + False + Effect + + + + + + + + False + True + 1 + + + + + True + False + 0 + none + + + True + False + 6 + + + _Play + True + True + True + True + + + False + True + 0 + + + + + S_lide Show + True + True + True + True + + + False + True + 1 + + + + + + + True + False + + + + + False + True + 2 + + + + + True + False + 0 + none + + + Automatic pre_view True True - True - False + False True + 0 + True - - False - True - 0 - - - - S_lide Show - False + + True - True - True - False - True + False - - False - True - 1 - - - - - True - False - + + False + True + 3 + False True - 2 - - - - - True - False - 0 - none - - - Automatic pre_view - False - True - True - False - False - True - 0 - True - - - - - True - False - - - - - False - True - 3 + 0 diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index ecdd38b02782..2471ef84cb28 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -1,317 +1,50 @@ - + True False - vertical 6 - 12 + vertical - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - True - - - - - - - - - - True - False - Apply to selected slides - - - - - - - - False - True - 0 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - vertical - 12 - - - True - False - 6 - - - True - False - Speed: - - - False - True - 0 - - - - - True - False - True - - Slow - Medium - Fast - - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 6 - - - True - False - Sound: - - - False - True - 0 - - - - - True - False - True - - No Sound - Stop Previous Sound - Other Sound... - - - - False - True - 1 - - - - - False - True - 1 - - - - - Loop until next sound - True - True - False - 12 - 0 - True - - - False - True - 2 - - - - - - - - - True - False - Modify transition - - - - - - - - False - True - 1 - - - - - True - False - 0 - none - - - True - False - 6 - 12 - - - True - False - - - On mouse click - True - True - False - 0 - True - True - rb_mouse_click - - - 0 - 0 - 1 - 1 - - - - - Automatically after - True - True - False - 0 - True - True - rb_mouse_click - - - 0 - 1 - 1 - 1 - - - - - True - True - ● - - - 1 - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - True - False - Advance slide - - - - - - - - False - True - 2 - - - - - Apply to All Slides - True - True - True - - - False - True - 3 - - - - + True False + vertical 12 - - Play + True - True - True + False + 0 + none + + + True + False + 6 + 12 + + + True + True + + + + + + + + + + True + False + Apply to selected slides + + + + + False @@ -320,11 +53,139 @@ - - Slide Show + True - True - True + False + 0 + none + + + True + False + 6 + 12 + + + True + False + vertical + 12 + + + True + False + 6 + + + True + False + Speed: + + + False + True + 0 + + + + + True + False + True + 0 + 1 + + Slow + Medium + Fast + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + Sound: + + + False + True + 0 + + + + + True + False + True + 0 + 1 + + No Sound + Stop Previous Sound + Other Sound... + + + + False + True + 1 + + + + + False + True + 1 + + + + + Loop until next sound + True + True + False + 12 + 0 + True + + + False + True + 2 + + + + + + + + + True + False + Modify transition + + + + + False @@ -332,26 +193,165 @@ 1 + + + True + False + 0 + none + + + True + False + 6 + 12 + + + True + False + + + On mouse click + True + True + False + 0 + True + rb_mouse_click + + + 0 + 0 + 1 + 1 + + + + + Automatically after + True + True + False + 0 + True + rb_mouse_click + + + 0 + 1 + 1 + 1 + + + + + True + True + ● + True + + + 1 + 1 + 1 + 1 + + + + + + + + + + + + True + False + Advance slide + + + + + + + + False + True + 2 + + + + + Apply to All Slides + True + True + True + + + False + True + 3 + + + + + True + False + 12 + + + Play + True + True + True + + + False + True + 0 + + + + + Slide Show + True + True + True + + + False + True + 1 + + + + + False + True + 4 + + + + + Automatic preview + True + True + False + 0 + True + + + False + True + 5 + + False True - 4 - - - - - Automatic preview - True - True - False - 0 - True - - - False - True - 5 + 0