cui/uiconfig/ui/additionsdialog.ui | 49 ---
cui/uiconfig/ui/additionsfragment.ui | 466 ++++++++++++++---------------------
2 files changed, 205 insertions(+), 310 deletions(-)
New commits:
commit 125fbbe6cc1956d370a01f83f47c637d39f5e596
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Fri Sep 4 14:49:36 2020 +0200
Commit: Andreas Kainz <kain...@gmail.com>
CommitDate: Fri Sep 4 21:09:02 2020 +0200
additions dialog ui update
Change-Id: I045f80d0c7df9c31979b0c74848557d77ebb80af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102045
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kain...@gmail.com>
diff --git a/cui/uiconfig/ui/additionsdialog.ui
b/cui/uiconfig/ui/additionsdialog.ui
index 4b91bd5950b9..2d9ccc3fb318 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -86,15 +86,14 @@
</child>
</object>
<object class="GtkDialog" id="AdditionsDialog">
- <property name="width_request">400</property>
- <property name="height_request">500</property>
+ <property name="width_request">550</property>
+ <property name="height_request">600</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes"
context="additionsdialog|AdditionsDialog">Additions</property>
- <property name="resizable">False</property>
<property name="modal">True</property>
- <property name="default_width">500</property>
- <property name="default_height">1</property>
+ <property name="default_width">300</property>
+ <property name="default_height">400</property>
<property name="type_hint">dialog</property>
<child>
<placeholder/>
@@ -107,17 +106,14 @@
<child internal-child="action_area">
<object class="GtkButtonBox">
<property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="halign">end</property>
+ <property name="layout_style">start</property>
<child>
<object class="GtkBox">
- <property name="width_request">300</property>
+ <property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkLabel" id="labelProgress">
<property name="visible">True</property>
@@ -162,7 +158,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -171,10 +167,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkEntry" id="entrySearch">
<property name="visible">True</property>
@@ -207,7 +205,7 @@
<object class="GtkImage" id="imageGear">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="icon_name">sfx2/res/actionaction013.png</property>
+ <property
name="icon_name">cmd/sc_menubar.png</property>
</object>
</child>
<child internal-child="accessible">
@@ -246,30 +244,7 @@
<property name="can_focus">False</property>
<property name="valign">start</property>
<property name="row_spacing">6</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="column_spacing">12</property>
<child>
<placeholder/>
</child>
diff --git a/cui/uiconfig/ui/additionsfragment.ui
b/cui/uiconfig/ui/additionsfragment.ui
index cc1701dfce82..b0a5d480fb44 100644
--- a/cui/uiconfig/ui/additionsfragment.ui
+++ b/cui/uiconfig/ui/additionsfragment.ui
@@ -5,85 +5,62 @@
<object class="GtkGrid" id="additionsEntry">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">24</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox">
+ <object class="GtkButton" id="buttonShowMore">
+ <property name="label" translatable="yes"
context="additionsDialog|buttonShowMore">Show More Extensions</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="buttonShowMore-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes"
context="additionsDialog|buttonShowMore">ButtonShowMore</property>
+ <property name="AtkObject::accessible-description"
translatable="yes" context="additionsDialog|buttonShowMore">This button shows
more extensions.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkBox">
- <property name="width_request">310</property>
- <property name="height_request">200</property>
+ <object class="GtkLinkButton" id="linkButtonName">
+ <property name="label">button</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="halign">start</property>
- <property name="valign">start</property>
- <property name="hexpand">False</property>
- <property name="vexpand">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="imageScreenshot">
- <property name="width_request">60</property>
- <property name="height_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="margin_top">3</property>
- <property name="hexpand">False</property>
- <property name="vexpand">False</property>
- <property name="stock">gtk-missing-image</property>
- <accessibility>
- <relation type="labelled-by" target="labelDescription"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="buttonInstall">
- <property name="label" translatable="yes"
context="additionsEntry|buttonInstall">button</property>
- <property name="width_request">310</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="margin_top">5</property>
- <property name="hexpand">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="relief">none</property>
+ <property name="uri">http://glade.gnome.org</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="orientation">vertical</property>
- <property name="baseline_position">top</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkLinkButton" id="linkButtonName">
- <property name="label">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <object class="GtkImage" id="imageVoting1">
+ <property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="relief">none</property>
- <property name="uri">http://glade.gnome.org</property>
+ <property name="icon_name">cmd/sc_starshapes.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="votingLabel"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -92,12 +69,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelAuthor">
- <property name="height_request">20</property>
- <property name="visible">True</property>
+ <object class="GtkImage" id="imageVoting2">
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label"></property>
+ <property name="icon_name">cmd/sc_starshapes.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="votingLabel"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -106,12 +84,13 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelDesc">
- <property name="visible">True</property>
+ <object class="GtkImage" id="imageVoting4">
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_top">3</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelDesc">Description:</property>
+ <property name="icon_name">cmd/sc_starshapes.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="votingLabel"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -120,33 +99,28 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelDescription">
- <property name="visible">True</property>
+ <object class="GtkImage" id="imageVoting3">
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="valign">start</property>
- <property name="label">label</property>
- <property name="wrap">True</property>
- <property name="wrap_mode">word-char</property>
- <property name="width_chars">1</property>
- <property name="max_width_chars">50</property>
+ <property name="icon_name">cmd/sc_starshapes.png</property>
<accessibility>
- <relation type="label-for" target="imageScreenshot"/>
+ <relation type="labelled-by" target="votingLabel"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelLicense">
- <property name="visible">True</property>
+ <object class="GtkImage" id="imageVoting5">
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_top">3</property>
- <property name="label">label</property>
+ <property name="icon_name">cmd/sc_starshapes.png</property>
+ <accessibility>
+ <relation type="labelled-by" target="votingLabel"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
@@ -155,212 +129,177 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="labelVersion">
+ <object class="GtkLabel" id="votingLabel">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="additionsEntry|votingLabel">Vote</property>
+ <accessibility>
+ <relation type="label-for" target="imageVoting1"/>
+ <relation type="label-for" target="imageVoting2"/>
+ <relation type="label-for" target="imageVoting4"/>
+ <relation type="label-for" target="imageVoting3"/>
+ <relation type="label-for" target="imageVoting5"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imageScreenshot">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="labelDescription"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelDescription">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="label">description</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="width_chars">1</property>
+ <property name="max_width_chars">50</property>
+ <accessibility>
+ <relation type="label-for" target="imageScreenshot"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelLicense">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label">label </property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelVersion">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label">label </property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="buttonInstall">
+ <property name="label" translatable="yes"
context="additionsEntry|buttonInstall">button</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">end</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="labelComments1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_top">3</property>
- <property name="label">label</property>
+ <property name="label" translatable="yes"
context="additionsEntry|labelComments">Downloads:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkLabel" id="labelDownloadNumber">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <child>
- <object class="GtkLabel" id="labelComments">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelComments">Comments:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLinkButton" id="linkButtonComments">
- <property name="label">button</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="relief">none</property>
- <property name="uri">http://glade.gnome.org</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label">label</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">6</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkLabel" id="labelComments">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkImage" id="imageVoting1">
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-about</property>
- <accessibility>
- <relation type="labelled-by" target="votingLabel"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageVoting2">
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-about</property>
- <accessibility>
- <relation type="labelled-by" target="votingLabel"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageVoting4">
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-about</property>
- <accessibility>
- <relation type="labelled-by" target="votingLabel"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageVoting3">
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-about</property>
- <accessibility>
- <relation type="labelled-by" target="votingLabel"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageVoting5">
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-about</property>
- <accessibility>
- <relation type="labelled-by" target="votingLabel"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="votingLabel">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="additionsEntry|votingLabel">No Voting</property>
- <accessibility>
- <relation type="label-for" target="imageVoting1"/>
- <relation type="label-for" target="imageVoting2"/>
- <relation type="label-for" target="imageVoting4"/>
- <relation type="label-for" target="imageVoting3"/>
- <relation type="label-for" target="imageVoting5"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"
context="additionsEntry|labelComments">Comments:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">7</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox">
+ <object class="GtkLinkButton" id="linkButtonComments">
+ <property name="label">button</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_top">3</property>
- <child>
- <object class="GtkImage" id="imageDownloadNumber">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="stock">gtk-directory</property>
- <accessibility>
- <relation type="labelled-by"
target="labelDownloadNumber"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelDownloadNumber">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label">label</property>
- <accessibility>
- <relation type="label-for" target="imageDownloadNumber"/>
- </accessibility>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="uri">http://glade.gnome.org</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">8</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
</packing>
</child>
</object>
@@ -369,24 +308,5 @@
<property name="top_attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="buttonShowMore">
- <property name="label" translatable="yes"
context="additionsDialog|buttonShowMore">Show More Extensions</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="margin_left">7</property>
- <property name="margin_right">7</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="buttonShowMore-atkobject">
- <property name="AtkObject::accessible-name" translatable="yes"
context="additionsDialog|buttonShowMore">ButtonShowMore</property>
- <property name="AtkObject::accessible-description"
translatable="yes" context="additionsDialog|buttonShowMore">This button shows
more extensions.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
</object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
