[Libreoffice-commits] core.git: sw/uiconfig
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Fri Nov 8 00:48:22 UTC 2019
sw/uiconfig/swriter/ui/bibliographyentry.ui | 151 ++++++++++++++++------------
1 file changed, 91 insertions(+), 60 deletions(-)
New commits:
commit 8d1f22659376357e133fe1116788fc04270bdef9
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Fri Nov 8 00:41:36 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Fri Nov 8 01:47:30 2019 +0100
Bibliography Insert Dialog update
Change-Id: I8b0eb23660aa15254d5a84eba4a045278a7c8152
Reviewed-on: https://gerrit.libreoffice.org/82255
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/sw/uiconfig/swriter/ui/bibliographyentry.ui b/sw/uiconfig/swriter/ui/bibliographyentry.ui
index 32ff10e594e0..3ee3c6bffb44 100644
--- a/sw/uiconfig/swriter/ui/bibliographyentry.ui
+++ b/sw/uiconfig/swriter/ui/bibliographyentry.ui
@@ -110,7 +110,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -123,147 +123,178 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkRadioButton" id="frombibliography">
+ <property name="label" translatable="yes" context="bibliographyentry|frombibliography">From bibliography database</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">12</property>
- <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label3">
+ <object class="GtkRadioButton" id="fromdocument">
+ <property name="label" translatable="yes" context="bibliographyentry|fromdocument">From document content</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="bibliographyentry|label3">Title</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="draw_indicator">True</property>
+ <property name="group">frombibliography</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">1</property>
</packing>
</child>
+ </object>
+ </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" context="bibliographyentry|label1">Entry</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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="frame2">
+ <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="alignment2">
+ <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="GtkGrid" id="grid2">
+ <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="author">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="width_chars">60</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label2">Author</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="bibliographyentry|label5">Short name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entrylb</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label3">Title</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">6</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="title">
+ <object class="GtkLabel" id="author">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="width_chars">60</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="entrylb">
+ <object class="GtkLabel" id="title">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="frombibliography">
- <property name="label" translatable="yes" context="bibliographyentry|frombibliography">From bibliography database</property>
+ <object class="GtkComboBoxText" id="entrylb">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="fromdocument">
- <property name="label" translatable="yes" context="bibliographyentry|fromdocument">From document content</property>
+ <object class="GtkEntry" id="entryed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">frombibliography</property>
+ <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="entryed">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label5">Short name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entrylb</property>
+ <property name="xalign">1</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="bibliographyentry|label1">Entry</property>
+ <property name="label" translatable="yes" context="bibliographyentry|label4">Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -271,7 +302,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
More information about the Libreoffice-commits
mailing list