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 /sd/uiconfig | |
| 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 'sd/uiconfig')
| -rw-r--r-- | sd/uiconfig/simpress/menubar/menubar.xml | 3 | ||||
| -rw-r--r-- | sd/uiconfig/simpress/ui/photoalbum.ui | 35 |
2 files changed, 34 insertions, 4 deletions
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index fc8047cc6171..73fa4fac578b 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -194,6 +194,7 @@ <menu:menu menu:id=".uno:GraphicMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:InsertGraphic"/> + <menu:menuitem menu:id=".uno:PhotoAlbumDialog"/> <menu:menu menu:id=".uno:Scan"> <menu:menupopup> <menu:menuitem menu:id=".uno:TwainSelect"/> @@ -215,8 +216,6 @@ <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ImportFromFile"/> - <menu:menuseparator/> - <menu:menuitem menu:id=".uno:PhotoAlbumDialog"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:FormatMenu"> diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index e4753b3703e2..e8423ad66f22 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -86,7 +86,7 @@ <property name="row_spacing">6</property> <child> <object class="GtkImage" id="preview_img"> - <property name="width_request">150</property> + <property name="width_request">200</property> <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -295,6 +295,25 @@ <property name="height">1</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="asr_check"> + <property name="label" translatable="yes">Keep Aspect Ratio</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> @@ -325,6 +344,18 @@ </packing> </child> <child> + <object class="GtkLabel" id="filename_lab"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="justify">right</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -395,7 +426,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> |