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(-)
New commits:
commit ba489418be7b67fd1e0e6a136ace9667a49a1013
Author: Samuel Mehrbrodt <s.mehrbr...@gmail.com>
Date: Sat May 11 11:54:21 2013 +0200
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 <cedric.bosdon...@free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdon...@free.fr>
diff --git a/sd/uiconfig/simpress/ui/photoalbum.ui
b/sd/uiconfig/simpress/ui/photoalbum.ui
index 352d4a2..13760d3 100644
--- a/sd/uiconfig/simpress/ui/photoalbum.ui
+++ b/sd/uiconfig/simpress/ui/photoalbum.ui
@@ -58,40 +58,101 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="vexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">12</property>
+ <property name="margin_top">6</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkButtonBox" id="buttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">start</property>
+ <child>
+ <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">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">0</property>
+ <property name="non_homogeneous">True</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>
+ <property name="non_homogeneous">True</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_left">12</property>
<property name="margin_top">6</property>
<property name="vexpand">True</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkButtonBox" id="buttonbox2">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkButton" id="file_btn">
- <property name="label" translatable="yes">Insert
Images</property>
- <property
name="use_action_appearance">False</property>
+ <object class="GtkScrolledWindow"
id="scrolledwindow1">
+ <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="receives_default">True</property>
- <property
name="use_action_appearance">False</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">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>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection"/>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -100,13 +161,64 @@
</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>
+ <object class="GtkButtonBox" id="buttonbox1">
<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="can_focus">False</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="up_btn">
+ <property name="label">gtk-go-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="tooltip_markup"
translatable="yes">Move Image Up</property>
+ <property name="tooltip_text"
translatable="yes">Move Image Up</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="down_btn">
+ <property name="label">gtk-go-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="tooltip_markup"
translatable="yes">Move Image Down</property>
+ <property name="tooltip_text"
translatable="yes">Move Image Down</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="rem_btn">
+ <property name="label">gtk-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="tooltip_markup"
translatable="yes">Remove Image from List</property>
+ <property name="tooltip_text"
translatable="yes">Remove Image from List</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -118,114 +230,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_top">6</property>
- <property name="vexpand">True</property>
+ <property name="margin_left">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkGrid" id="grid3">
+ <object class="GtkLabel" id="label2">
<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="GtkButtonBox" id="buttonbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
- <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>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <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>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <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>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </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="GtkScrolledWindow"
id="scrolledwindow1">
- <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">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>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection"/>
- </child>
- </object>
- </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>
- </packing>
- </child>
+ <property name="margin_bottom">6</property>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Preview</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
<property name="expand">False</property>
@@ -234,20 +257,49 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <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="valign">start</property>
+ <property name="yalign">0</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Album
Layout</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">6</property>
- <property name="orientation">vertical</property>
+ <property name="margin_left">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Preview</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label"
translatable="yes">Slide Layout</property>
+ <property
name="mnemonic_widget">opt_combo</property>
</object>
<packing>
<property name="expand">False</property>
@@ -256,14 +308,18 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="preview_img">
- <property name="width_request">200</property>
- <property name="height_request">150</property>
+ <object class="GtkComboBox" id="opt_combo">
+ <property name="width_request">160</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="yalign">0</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="model">liststore2</property>
+ <property name="active">0</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -275,125 +331,57 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</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="margin_left">12</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Album
Content</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </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="GtkFrame" id="frame3">
+ <child type="label">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_top">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Slide
Layout</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">opt_combo</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="GtkComboBox" id="opt_combo">
- <property name="width_request">160</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore2</property>
- <property name="active">0</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </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>
- </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>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Album
Layout</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="label" translatable="yes">Album
Content</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -418,16 +406,16 @@
</columns>
<data>
<row>
- <col id="0" translatable="yes">Fit to slide</col>
+ <col id="0" translatable="yes">1 Image</col>
</row>
<row>
- <col id="0" translatable="yes">1 image with title</col>
+ <col id="0" translatable="yes">1 Image with Title</col>
</row>
<row>
- <col id="0" translatable="yes">2 images</col>
+ <col id="0" translatable="yes">2 Images</col>
</row>
<row>
- <col id="0" translatable="yes">4 images</col>
+ <col id="0" translatable="yes">4 Images</col>
</row>
</data>
</object>
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index f6433d7..e9bb616 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 3340fdd..07813ad 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 fe8d4ba..8ce7445 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
