basctl/uiconfig/basicide/ui/basicmacrodialog.ui | 428 ++++++++++++------------ 1 file changed, 226 insertions(+), 202 deletions(-)
New commits: commit cb6fd6b3427b6cf74d5b262f5acc015029f24148 Author: Sabin Frandes <sabin.fran...@cib.de> Date: Fri Sep 15 17:12:18 2017 +0200 tdf#112381 Macro Organizer: Move Run, Close, Help buttons to the bottom Change-Id: Id08ce71bcd060121630c3a9194f8cfe663ca5822 Reviewed-on: https://gerrit.libreoffice.org/42331 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Tested-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui index 248fef505f96..33ea215e7939 100644 --- a/basctl/uiconfig/basicide/ui/basicmacrodialog.ui +++ b/basctl/uiconfig/basicide/ui/basicmacrodialog.ui @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.16.0 on Fri Jan 3 21:01:14 2014 --> +<!-- Generated with glade 3.18.3 --> <interface domain="basctl"> - <!-- interface-requires gtk+ 3.0 --> - <!-- interface-requires LibreOffice 1.0 --> + <requires lib="gtk+" version="3.0"/> + <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="BasicMacroDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -11,12 +11,15 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="layout_style">start</property> + <property name="homogeneous">True</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="run"> <property name="label" translatable="yes" context="basicmacrodialog|run">Run</property> @@ -34,91 +37,6 @@ </packing> </child> <child> - <object class="GtkButton" id="assign"> - <property name="label" translatable="yes" context="basicmacrodialog|assign">Assign...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit"> - <property name="label" translatable="yes" context="basicmacrodialog|edit">Edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="organize"> - <property name="label" translatable="yes" context="basicmacrodialog|organize">Organizer...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="newlibrary"> - <property name="label" translatable="yes" context="basicmacrodialog|newlibrary">New Library</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - <property name="secondary">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="newmodule"> - <property name="label" translatable="yes" context="basicmacrodialog|newmodule">New Module</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">6</property> - <property name="secondary">True</property> - </packing> - </child> - <child> <object class="GtkButton" id="close"> <property name="label">gtk-close</property> <property name="visible">True</property> @@ -156,104 +74,199 @@ </packing> </child> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="spacing">12</property> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="svtlo-SvTreeListBox" id="macros:border"> - <property name="width_request">280</property> - <property name="height_request">300</property> + <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Tree List-selection1"/> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="svtlo-SvTreeListBox" id="macros:border"> + <property name="width_request">280</property> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Tree List-selection1"/> + </child> + </object> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="existingmacrosft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property> + <property name="track_visited_links">False</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="existingmacrosft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="basicmacrodialog|existingmacrosft">Existing Macros In:</property> - <property name="track_visited_links">False</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame2"> - <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="alignment2"> + <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="basctllo-TreeListBox" id="libraries:border"> - <property name="width_request">280</property> - <property name="height_request">300</property> + <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can_focus">False</property> <property name="vexpand">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="Macro Library List-selection1"/> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="basctllo-TreeListBox" id="libraries:border"> + <property name="width_request">280</property> + <property name="height_request">300</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="opacity">0.91000000000000003</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="Macro Library List-selection1"/> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkBox" id="box2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="macrofromft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="basicmacrodialog|macrofromft">Macro From</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="macrotoft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="basicmacrodialog|macrotoft">Save Macro In</property> + <property name="xalign">0</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> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> - <child type="label"> - <object class="GtkBox" id="box1"> + <child> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkLabel" id="macrofromft"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" context="basicmacrodialog|macrofromft">Macro From</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkEntry" id="macronameedit"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="invisible_char">â</property> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="libraryft1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="basicmacrodialog|libraryft1">Macro Name</property> <attributes> <attribute name="weight" value="bold"/> </attributes> </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="buttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="resize_mode">immediate</property> + <property name="orientation">vertical</property> + <property name="spacing">5</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="assign"> + <property name="label" translatable="yes" context="basicmacrodialog|assign">Assign...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> <packing> <property name="expand">False</property> <property name="fill">True</property> @@ -261,14 +274,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="macrotoft"> + <object class="GtkButton" id="edit"> + <property name="label" translatable="yes" context="basicmacrodialog|edit">Edit</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" context="basicmacrodialog|macrotoft">Save Macro In</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="can_focus">True</property> + <property name="receives_default">True</property> </object> <packing> <property name="expand">False</property> @@ -276,58 +286,78 @@ <property name="position">1</property> </packing> </child> - </object> - </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="GtkFrame" id="frame1"> - <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="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="top_padding">6</property> - <property name="left_padding">12</property> <child> - <object class="GtkEntry" id="macronameedit"> + <object class="GtkButton" id="delete"> + <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="invisible_char">â</property> + <property name="receives_default">True</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> + <child> + <object class="GtkButton" id="organize"> + <property name="label" translatable="yes" context="basicmacrodialog|organize">Organizer...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="newlibrary"> + <property name="label" translatable="yes" context="basicmacrodialog|newlibrary">New Library</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="newmodule"> + <property name="label" translatable="yes" context="basicmacrodialog|newmodule">New Module</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> </child> </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="libraryft1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="basicmacrodialog|libraryft1">Macro Name</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> + <child> + <placeholder/> + </child> + <child> + <placeholder/> </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">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">True</property> @@ -339,12 +369,6 @@ </child> <action-widgets> <action-widget response="0">run</action-widget> - <action-widget response="0">assign</action-widget> - <action-widget response="0">edit</action-widget> - <action-widget response="0">delete</action-widget> - <action-widget response="0">organize</action-widget> - <action-widget response="0">newlibrary</action-widget> - <action-widget response="0">newmodule</action-widget> <action-widget response="0">close</action-widget> <action-widget response="0">help</action-widget> </action-widgets>
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits