Skip to content

C
core
Kaydet (Commit) ba489418 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt Kaydeden (comit) Bosdonnat Cedric
Dosyalara gözat
Seçenekler

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/3852Reviewed-by: 's avatarBosdonnat Cedric <cedric.bosdonnat@free.fr>
Tested-by: 's avatarBosdonnat Cedric <cedric.bosdonnat@free.fr>
üst 1c7af341
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 243 deletions
sd/uiconfig/simpress/ui/photoalbum.ui
Dosyayı görüntüle @ ba489418
...@@ -58,40 +58,101 @@ ...@@ -58,40 +58,101 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box1"> <object class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="vexpand">True</property>
<property name="spacing">12</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child> <child>
<object class="GtkFrame" id="frame1"> <object class="GtkBox" id="box2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="vexpand">True</property>
<property name="label_xalign">0</property> <property name="orientation">vertical</property>
<property name="shadow_type">none</property>
<child> <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="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property>
<property name="margin_top">6</property> <property name="margin_top">6</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child> <child>
<object class="GtkButtonBox" id="buttonbox2"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="orientation">vertical</property>
<property name="layout_style">start</property>
<child> <child>
<object class="GtkButton" id="file_btn"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="label" translatable="yes">Insert Images</property> <property name="width_request">300</property>
<property name="use_action_appearance">False</property> <property name="height_request">200</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="hexpand">True</property>
<property name="use_action_appearance">False</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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -100,13 +161,64 @@ ...@@ -100,13 +161,64 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="textbox_btn"> <object class="GtkButtonBox" id="buttonbox1">
<property name="label" translatable="yes">Insert Text Slide</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="layout_style">start</property>
<property name="use_action_appearance">False</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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -118,114 +230,25 @@ ...@@ -118,114 +230,25 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box4"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_top">6</property> <property name="margin_left">6</property>
<property name="vexpand">True</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkGrid" id="grid3"> <object class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="margin_bottom">6</property>
<property name="vexpand">True</property> <property name="xalign">0</property>
<property name="row_spacing">6</property> <property name="label" translatable="yes">Preview</property>
<child> <attributes>
<object class="GtkButtonBox" id="buttonbox1"> <attribute name="weight" value="bold"/>
<property name="visible">True</property> </attributes>
<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>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -234,20 +257,49 @@ ...@@ -234,20 +257,49 @@
</packing> </packing>
</child> </child>
<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="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">6</property> <property name="margin_left">12</property>
<property name="orientation">vertical</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label2"> <object class="GtkLabel" id="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="xalign">0</property> <property name="label" translatable="yes">Slide Layout</property>
<property name="label" translatable="yes">Preview</property> <property name="mnemonic_widget">opt_combo</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -256,14 +308,18 @@ ...@@ -256,14 +308,18 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkImage" id="preview_img"> <object class="GtkComboBox" id="opt_combo">
<property name="width_request">200</property> <property name="width_request">160</property>
<property name="height_request">150</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="valign">start</property> <property name="model">liststore2</property>
<property name="yalign">0</property> <property name="active">0</property>
<property name="stock">gtk-missing-image</property> <child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -275,125 +331,57 @@ ...@@ -275,125 +331,57 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</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> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
</child> <packing>
<child type="label"> <property name="expand">False</property>
<object class="GtkLabel" id="label1"> <property name="fill">True</property>
<property name="visible">True</property> <property name="position">1</property>
<property name="can_focus">False</property> </packing>
<property name="label" translatable="yes">Album Content</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child> </child>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child type="label">
<object class="GtkFrame" id="frame3"> <object class="GtkLabel" id="label1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label_xalign">0</property> <property name="label" translatable="yes">Album Content</property>
<property name="shadow_type">none</property> <attributes>
<child> <attribute name="weight" value="bold"/>
<object class="GtkGrid" id="grid5"> </attributes>
<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>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
...@@ -418,16 +406,16 @@ ...@@ -418,16 +406,16 @@
</columns> </columns>
<data> <data>
<row> <row>
<col id="0" translatable="yes">Fit to slide</col> <col id="0" translatable="yes">1 Image</col>
</row> </row>
<row> <row>
<col id="0" translatable="yes">1 image with title</col> <col id="0" translatable="yes">1 Image with Title</col>
</row> </row>
<row> <row>
<col id="0" translatable="yes">2 images</col> <col id="0" translatable="yes">2 Images</col>
</row> </row>
<row> <row>
<col id="0" translatable="yes">4 images</col> <col id="0" translatable="yes">4 Images</col>
</row> </row>
</data> </data>
</object> </object>
......
vcl/inc/svids.hrc
Dosyayı görüntüle @ ba489418
...@@ -163,6 +163,8 @@ ...@@ -163,6 +163,8 @@
#define SV_BUTTONTEXT_UNDO 10121 #define SV_BUTTONTEXT_UNDO 10121
#define SV_BUTTONTEXT_PASTE 10122 #define SV_BUTTONTEXT_PASTE 10122
#define SV_BUTTONTEXT_NEXT 10123 #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_FIRST SV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10210 #define SV_STDTEXT_SERVICENOTAVAILABLE 10210
......
vcl/source/src/btntext.src
Dosyayı görüntüle @ ba489418
...@@ -141,4 +141,14 @@ String SV_BUTTONTEXT_NEXT ...@@ -141,4 +141,14 @@ String SV_BUTTONTEXT_NEXT
Text [ en-US ] = "~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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/source/window/builder.cxx
Dosyayı görüntüle @ ba489418
...@@ -585,6 +585,10 @@ namespace ...@@ -585,6 +585,10 @@ namespace
return (VclResId(SV_BUTTONTEXT_PASTE).toString()); return (VclResId(SV_BUTTONTEXT_PASTE).toString());
else if (rType == "gtk-media-next") else if (rType == "gtk-media-next")
return (VclResId(SV_BUTTONTEXT_NEXT).toString()); 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()); SAL_WARN("vcl.layout", "unknown stock type: " << rType.getStr());
return OUString(); return OUString();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment