From ba489418be7b67fd1e0e6a136ace9667a49a1013 Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Sat, 11 May 2013 11:54:21 +0200 Subject: Related fdo#35546: Further improve Layout of Photo Album Dialog With suggestions from http://nabble.documentfoundation.org/Streamlining-the-Photo-Album-Creator-td4054397.html * Moved "Album Layout" to the right * Changed buttons to GTK Stock buttons, added VCL equivalents * Improved the wording of the Layout options Change-Id: Icfb24a8678d096bb596bcdeabbf539e9fe1835db Reviewed-on: https://gerrit.libreoffice.org/3852 Reviewed-by: Bosdonnat Cedric Tested-by: Bosdonnat Cedric --- sd/uiconfig/simpress/ui/photoalbum.ui | 474 +++++++++++++++++----------------- vcl/inc/svids.hrc | 2 + vcl/source/src/btntext.src | 10 + vcl/source/window/builder.cxx | 4 + 4 files changed, 247 insertions(+), 243 deletions(-) diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index 352d4a2475b8..13760d3c7516 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -58,40 +58,101 @@ - + True False - vertical - 12 + True + 0 + none - + True False + 12 + 6 True - 0 - none + vertical - + + True + False + 6 + start + + + Insert Images + False + True + True + True + False + + + False + True + 0 + True + + + + + Insert Text Slide + False + True + True + True + False + + + False + True + 1 + True + + + + + False + True + 0 + + + + True False - 12 6 True - vertical - + True False - 6 - start + vertical - - Insert Images - False + + 300 + 200 True True - True - False + True + True + in + + + 300 + 200 + True + True + True + True + liststore1 + 0 + both + + + + + False @@ -100,13 +161,64 @@ - - Insert Text Slide - False + True - True - True - False + False + start + + + gtk-go-up + False + True + True + True + Move Image Up + Move Image Up + False + True + + + False + True + 0 + + + + + gtk-go-down + False + True + True + True + Move Image Down + Move Image Down + False + True + + + False + True + 1 + + + + + gtk-remove + False + True + True + True + Remove Image from List + Remove Image from List + False + True + + + False + True + 2 + + False @@ -118,114 +230,25 @@ False True - 0 + 1 - + True False - 6 - True + 6 + vertical - + True False - True - True - 6 - - - True - False - 6 - start - - - Up - False - True - True - True - False - - - False - True - 0 - - - - - Down - False - True - True - True - False - - - False - True - 1 - - - - - Remove - False - True - True - True - False - - - False - True - 2 - - - - - 0 - 1 - 1 - 1 - - - - - 300 - 200 - True - True - True - True - in - - - 300 - 200 - True - True - True - True - liststore1 - 0 - both - - - - - - - - 0 - 0 - 1 - 1 - - + 6 + 0 + Preview + + + False @@ -234,20 +257,49 @@ - + + 200 + 150 + True + False + start + 0 + gtk-missing-image + + + False + True + 1 + + + + + True + False + 0 + Album Layout + + + + + + False + True + 2 + + + + True False - 6 - vertical + 12 + 6 - + True False - 0 - Preview - - - + Slide Layout + opt_combo False @@ -256,14 +308,18 @@ - - 200 - 150 + + 160 True False - start - 0 - gtk-missing-image + liststore2 + 0 + + + + 0 + + False @@ -275,125 +331,57 @@ False True - 1 + 3 + + + + + Keep Aspect Ratio + False + True + True + False + 12 + False + 0 + True + True + + + False + True + 4 False True - 1 + 2 - - - - True - False - Album Content - - - - + + False + True + 1 + - - False - True - 0 - - - + + True False - 0 - none - - - True - False - 12 - 6 - 12 - - - True - False - Slide Layout - True - opt_combo - - - 0 - 0 - 1 - 1 - - - - - 160 - True - False - liststore2 - 0 - - - - 0 - - - - - 1 - 0 - 1 - 1 - - - - - Keep Aspect Ratio - False - True - True - False - False - 0 - True - True - - - 0 - 1 - 2 - 1 - - - - - - - True - False - Album Layout - - - - - + Album Content + + + - - False - True - 2 - - True + False True 1 @@ -418,16 +406,16 @@ - Fit to slide + 1 Image - 1 image with title + 1 Image with Title - 2 images + 2 Images - 4 images + 4 Images diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc index f6433d79a092..e9bb616556e4 100644 --- a/vcl/inc/svids.hrc +++ b/vcl/inc/svids.hrc @@ -163,6 +163,8 @@ #define SV_BUTTONTEXT_UNDO 10121 #define SV_BUTTONTEXT_PASTE 10122 #define SV_BUTTONTEXT_NEXT 10123 +#define SV_BUTTONTEXT_GO_UP 10124 +#define SV_BUTTONTEXT_GO_DOWN 10125 #define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE #define SV_STDTEXT_SERVICENOTAVAILABLE 10210 diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src index 3340fdd1be6a..07813ad0ba8d 100644 --- a/vcl/source/src/btntext.src +++ b/vcl/source/src/btntext.src @@ -141,4 +141,14 @@ String SV_BUTTONTEXT_NEXT Text [ en-US ] = "~Next" ; }; +String SV_BUTTONTEXT_GO_UP +{ + Text [ en-US ] = "~Up" ; +}; + +String SV_BUTTONTEXT_GO_DOWN +{ + Text [ en-US ] = "Do~wn" ; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index fe8d4bae8305..8ce744577130 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -585,6 +585,10 @@ namespace return (VclResId(SV_BUTTONTEXT_PASTE).toString()); else if (rType == "gtk-media-next") return (VclResId(SV_BUTTONTEXT_NEXT).toString()); + else if (rType == "gtk-go-up") + return (VclResId(SV_BUTTONTEXT_GO_UP).toString()); + else if (rType == "gtk-go-down") + return (VclResId(SV_BUTTONTEXT_GO_DOWN).toString()); SAL_WARN("vcl.layout", "unknown stock type: " << rType.getStr()); return OUString(); } -- cgit v1.2.3