sc/uiconfig/scalc/ui/definename.ui | 33 +----- sc/uiconfig/scalc/ui/protectsheetdlg.ui | 153 +++++++++++++------------------- 2 files changed, 72 insertions(+), 114 deletions(-)
New commits: commit d3b6f1de8971a086aa1da829fc01d7c77a09502b Author: Adolfo Jayme Barrientos <[email protected]> Date: Wed Apr 22 10:38:52 2015 -0500 Related: tdf#90782 Switch to a single-column layout Now that a label has been made longer, this will save space. Also, removed a now-redundant explanation to reduce the number of translatable messages, and dropped a spurious âyalignâ value. Change-Id: I46652effa364a867c8df28fb9373c48ab2fd2d74 diff --git a/sc/uiconfig/scalc/ui/definename.ui b/sc/uiconfig/scalc/ui/definename.ui index 47e9a5d..06215a9 100644 --- a/sc/uiconfig/scalc/ui/definename.ui +++ b/sc/uiconfig/scalc/ui/definename.ui @@ -24,10 +24,9 @@ <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="use_stock">True</property> - <property name="yalign">0.55000001192092896</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> <property name="secondary">True</property> @@ -78,24 +77,10 @@ <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Define the name and range or formula expression.</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> @@ -121,7 +106,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -135,7 +120,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">4</property> </packing> </child> <child> @@ -145,8 +130,8 @@ <property name="invisible_char">â¢</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -182,8 +167,8 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -193,8 +178,8 @@ <property name="hexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">5</property> </packing> </child> </object> commit 8b7799972a95da50e1e927488bb2b9d4b47b12b6 Author: Adolfo Jayme Barrientos <[email protected]> Date: Sat Apr 18 19:08:35 2015 -0500 Remove a superfluous âOptionsâ frame which enclosed only one widget Change-Id: I1ec58cdc2d8b3f080638918e44ee853cd0a5ed58 diff --git a/sc/uiconfig/scalc/ui/protectsheetdlg.ui b/sc/uiconfig/scalc/ui/protectsheetdlg.ui index a101cf5..388c289 100644 --- a/sc/uiconfig/scalc/ui/protectsheetdlg.ui +++ b/sc/uiconfig/scalc/ui/protectsheetdlg.ui @@ -10,11 +10,11 @@ <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> - <property name="spacing">2</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> <child> <object class="GtkButton" id="ok"> @@ -58,6 +58,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="position">2</property> + <property name="secondary">True</property> </packing> </child> </object> @@ -105,12 +106,13 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="column_spacing">6</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="halign">end</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password1</property> @@ -124,7 +126,8 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> + <property name="halign">end</property> + <property name="xalign">1</property> <property name="label" translatable="yes">_Confirm:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password2</property> @@ -177,46 +180,30 @@ </packing> </child> <child> - <object class="GtkFrame" id="options"> + <object class="GtkBox" id="box3"> <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="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkLabel" id="label4"> <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> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <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">Allow all users of this sheet to:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">checklist:border</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxCheckListBox" id="checklist:border"> + <property name="xalign">0</property> + <property name="label" translatable="yes">Allow all users of this sheet to:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">checklist:border</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="svxcorelo-SvxCheckListBox" id="checklist:border"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> @@ -225,61 +212,47 @@ <object class="GtkTreeSelection" id="Checked Tree List-selection1"/> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box4"> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkLabel" id="protected"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select protected cells</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="unprotected"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Select unprotected cells</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">2</property> - </packing> - </child> - </object> - </child> - </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">4</property> + <property name="position">1</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> + <child> + <object class="GtkBox" id="box4"> <property name="can_focus">False</property> - <property name="label" translatable="yes">Options</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="homogeneous">True</property> + <child> + <object class="GtkLabel" id="protected"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select protected cells</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="unprotected"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Select unprotected cells</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">2</property> + </packing> </child> </object> <packing>
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
