diff options
| author | Gergő Mocsi <gmocsi91@gmail.com> | 2013-04-02 12:57:59 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-04-10 15:00:25 +0000 |
| commit | 3a56257e858c6793156a78b387451802593455e0 (patch) | |
| tree | 2e766f7b5dbb9a223f61731851e07e5655635b7e /officecfg | |
| parent | 857adeada9cc3276e79ceb828959a3ffe2d7409b (diff) | |
Create Photo Album implementation
Added a checkbox to enable/diable Keep Aspect ratio.
Options 2 images/slide, 4 images/slide implemented.
UI tweaks: dialog window remembers last used directory (via config),
buttons get enabled/disabled according to the content of the ListBox.
ListBox show filename only, full path is shown lower in a label.
Dialog window reopens again, if slide preview is not in focus.
Added a title slide: author, title.
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
sd/uiconfig/simpress/ui/photoalbum.ui
Change-Id: I68d2a3e00f8c55b909fe4d98aa3958188653390e
Reviewed-on: https://gerrit.libreoffice.org/3169
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'officecfg')
3 files changed, 23 insertions, 1 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index dfff9b06122a..3793b99f7ed3 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -195,4 +195,9 @@ <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> </prop> </node> + <node oor:name="Pictures" oor:op="fuse" oor:mandatory="true"> + <prop oor:name="Path"> + <value>$(work)</value> + </prop> + </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 50afd03ca69d..d135cd13d100 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -55,7 +55,7 @@ </node> <node oor:name=".uno:PhotoAlbumDialog" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Create Photo Album</value> + <value xml:lang="en-US">Photo Album</value> </prop> <prop oor:name="Properties" oor:type="xs:int"> <value>1</value> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index e84ba829c64a..ec0c12bacdd3 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -1594,5 +1594,22 @@ </group> </group> </group> + <group oor:name="Pictures"> + <info> + <desc> + Contains configuration items form Impress Photo Album function. + </desc> + </info> + <prop oor:name="Path" oor:type="xs:string" oor:nillable="false"> + <info> + <author>GM</author> + <desc> + Access path, where images were loaded last time. + The default is work directory. + </desc> + </info> + <value>$(work)</value> + </prop> + </group> </component> </oor:component-schema> |