diff options
author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2013-05-09 11:29:48 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-05-09 09:58:12 +0000 |
commit | aa0bc15b42e8d432def185089ea8fca17f3fd8c8 (patch) | |
tree | f802549f2d9809412ba214e14c8fffb6ac361c98 /sd | |
parent | 86b73eeef4350f0bf29c8ff3c71abb86fc1f6572 (diff) |
Related fdo#35546 Improve Layout of "Insert Photo Album" Dialog
No Objections from the Design list: http://nabble.documentfoundation.org/Streamlining-the-Photo-Album-Creator-td4054397.html
Change-Id: Ib880023b956c6d94d8110829d0c32281854a0705
Reviewed-on: https://gerrit.libreoffice.org/3833
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/app/strings.src | 4 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/photoalbum.ui | 277 |
2 files changed, 132 insertions, 149 deletions
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 928e03e077c9..eb6b959741b3 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1270,12 +1270,12 @@ String STRING_DRAG_AND_DROP_SLIDES String STR_PHOTO_ALBUM_EMPTY_WARNING { - Text [ en-US ] = "Please add images to the album." ; + Text [ en-US ] = "Please add Images to the Album." ; }; String STR_PHOTO_ALBUM_TEXTBOX { - Text [ en-US ] = "Text Box"; + Text [ en-US ] = "Text Slide"; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui b/sd/uiconfig/simpress/ui/photoalbum.ui index e8423ad66f22..87304e343409 100644 --- a/sd/uiconfig/simpress/ui/photoalbum.ui +++ b/sd/uiconfig/simpress/ui/photoalbum.ui @@ -4,11 +4,9 @@ <object class="GtkDialog" id="PhotoAlbumCreatorDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Photo Album Creator</property> - <property name="resizable">False</property> + <property name="title" translatable="yes">Create Photo Album</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> - <property name="has_resize_grip">False</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -20,12 +18,14 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="create_btn"> - <property name="label" translatable="yes">Create</property> + <property name="label" translatable="yes">Insert Slides</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -36,9 +36,11 @@ <child> <object class="GtkButton" id="cancel_btn"> <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -65,84 +67,74 @@ <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="vexpand">True</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="margin_left">6</property> + <property name="margin_top">6</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkButtonBox" id="buttonbox2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <property name="row_homogeneous">True</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> <child> - <object class="GtkGrid" id="grid2"> + <object class="GtkButton" id="file_btn"> + <property name="label" translatable="yes">Insert Images</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkImage" id="preview_img"> - <property name="width_request">200</property> - <property name="height_request">150</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Preview:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">preview_img</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> + <object class="GtkButton" id="textbox_btn"> + <property name="label" translatable="yes">Insert Text Slide</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</property> + <property name="vexpand">True</property> + <child> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Images:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">scrolledwindow1</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -151,9 +143,11 @@ <child> <object class="GtkButton" id="up_btn"> <property name="label" translatable="yes">Up</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -164,9 +158,11 @@ <child> <object class="GtkButton" id="down_btn"> <property name="label" translatable="yes">Down</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -177,9 +173,11 @@ <child> <object class="GtkButton" id="rem_btn"> <property name="label" translatable="yes">Remove</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> </object> <packing> <property name="expand">False</property> @@ -190,24 +188,28 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="width_request">100</property> - <property name="height_request">85</property> + <property name="width_request">300</property> + <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="shadow_type">in</property> <child> <object class="GtkTreeView" id="images_tree"> - <property name="width_request">150</property> - <property name="height_request">84</property> + <property name="width_request">300</property> + <property name="height_request">200</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="model">liststore1</property> <property name="search_column">0</property> <property name="enable_grid_lines">both</property> @@ -219,110 +221,69 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkGrid" id="grid4"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkButton" id="file_btn"> - <property name="label" translatable="yes">File/Folder</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> + <property name="margin_left">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkButton" id="textbox_btn"> - <property name="label" translatable="yes">New Text Box</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Insert from:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">file_btn</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Preview</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkImage" id="preview_img"> + <property name="width_request">200</property> + <property name="height_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Insert text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textbox_btn</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">1</property> - <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> + <property name="valign">start</property> + <property name="yalign">0</property> + <property name="stock">gtk-missing-image</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> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -338,8 +299,8 @@ </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">False</property> + <property name="expand">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -347,16 +308,19 @@ <object class="GtkLabel" id="filename_lab"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="margin_left">6</property> + <property name="xalign">0</property> <property name="justify">right</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -376,7 +340,7 @@ <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Picture layout:</property> + <property name="label" translatable="yes">Slide Layout</property> <property name="use_underline">True</property> <property name="mnemonic_widget">opt_combo</property> </object> @@ -408,12 +372,31 @@ <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">1</property> + <property name="width">2</property> + <property name="height">1</property> + </packing> + </child> </object> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Album Layout</property> |