diff options
author | Pedro Pinto Silva <pedro.silva@collabora.com> | 2021-04-23 19:46:22 +0200 |
---|---|---|
committer | Pedro Silva <pedro.silva@collabora.com> | 2021-04-23 20:38:06 +0200 |
commit | a6642e9b682ac245ff4700cb806e843d9afae53c (patch) | |
tree | 25dbf0a90c4d9c5b720c56ee3689db083ea769bd /cui | |
parent | Add also the comma separator between Event Trace events (diff) | |
download | core-a6642e9b682ac245ff4700cb806e843d9afae53c.tar.gz core-a6642e9b682ac245ff4700cb806e843d9afae53c.zip |
[cp] Adjust About dialog, add missing assets
- update assets
- also add different image as imAbout for unstable snapshot
- Dialog: Fix alignment:
too many different alignments (graphic element on the left
with text on the left and logo on top centered aligned with the text
that is on the left). Force logo (imBrand) to be left aligned as well.
Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I369e8893d4ab9fb5f0ed3c39d157b5b9e7a7e952
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114566
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/uiconfig/ui/aboutdialog.ui | 209 |
1 files changed, 105 insertions, 104 deletions
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 29fc5bc76ef2..219ad8020ab9 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -1,44 +1,47 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkImage" id="imCopy"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="stock">gtk-copy</property> </object> <object class="GtkDialog" id="AboutDialog"> - <property name="can-focus">False</property> - <property name="border-width">6</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="title" translatable="yes" context="aboutdialog|AboutDialog">About %PRODUCTNAME</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="window-position">center-on-parent</property> - <property name="type-hint">dialog</property> + <property name="window_position">center-on-parent</property> + <property name="type_hint">dialog</property> + <child> + <placeholder/> + </child> <child internal-child="vbox"> <object class="GtkBox"> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox"> - <property name="can-focus">False</property> - <property name="margin-top">12</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> <property name="hexpand">True</property> - <property name="layout-style">end</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="btnClose"> <property name="label">gtk-close</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <property name="use-stock">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="pack-type">end</property> + <property name="pack_type">end</property> <property name="position">3</property> </packing> </child> @@ -46,63 +49,61 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> + <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=7 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row-spacing">6</property> + <property name="row_spacing">6</property> <child> <object class="GtkImage" id="imAbout"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> - <property name="margin-start">12</property> - <property name="margin-end">24</property> + <property name="margin_start">12</property> + <property name="margin_end">24</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> <property name="height">7</property> </packing> </child> <child> <object class="GtkImage" id="imBrand"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> + <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">center</property> - <property name="margin-top">24</property> - <property name="margin-bottom">24</property> + <property name="margin_top">24</property> + <property name="margin_bottom">24</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=6 --> <object class="GtkGrid"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin-start">6</property> - <property name="column-spacing">12</property> + <property name="margin_start">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="lbVersion"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|lbVersion">Version:</property> <property name="wrap">True</property> @@ -112,14 +113,14 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="lbBuild"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|lbBuild">Build:</property> <property name="xalign">0</property> @@ -128,14 +129,14 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="lbEnvironment"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|lbEnvironment">Environment:</property> <property name="xalign">0</property> @@ -144,50 +145,50 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="lbVersionString"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">7.0</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <accessibility> <relation type="labelled-by" target="lbVersion"/> </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="lbEnvString"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">8 cores</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <accessibility> <relation type="labelled-by" target="lbEnvironment"/> </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> <object class="GtkLinkButton" id="lbBuildString"> <property name="label">0815</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="relief">none</property> <property name="xalign">0</property> <accessibility> @@ -198,14 +199,14 @@ </style> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="lbMisc"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|lbExtra">Misc:</property> <property name="xalign">0</property> @@ -215,31 +216,31 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="left_attach">0</property> + <property name="top_attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="lbMiscString"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">Calc</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <accessibility> <relation type="labelled-by" target="lbMisc"/> </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="left_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="lbLocale"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|lbLocale">Locale:</property> <property name="xalign">0</property> @@ -248,31 +249,31 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="lbLocaleString"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">English</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <accessibility> <relation type="labelled-by" target="lbLocale"/> </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="lbUI"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="aboutdialog|lbUI">User Interface:</property> <property name="xalign">0</property> <accessibility> @@ -280,79 +281,79 @@ </accessibility> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="lbUIString"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label">VCL: gtk</property> <property name="wrap">True</property> - <property name="max-width-chars">40</property> + <property name="max_width_chars">40</property> <property name="xalign">0</property> <accessibility> <relation type="labelled-by" target="lbUI"/> </accessibility> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">6</property> + <property name="left_attach">1</property> + <property name="top_attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="lbAbout"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">end</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="label" translatable="yes" context="aboutdialog|description">%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</property> <property name="wrap">True</property> - <property name="max-width-chars">60</property> + <property name="max_width_chars">60</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="lbCopyright"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="label" context="aboutdialog|copyright">%COPYRIGHT</property> <property name="wrap">True</property> - <property name="max-width-chars">60</property> + <property name="max_width_chars">60</property> <property name="xalign">0</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLinkButton" id="btnCredits"> <property name="label" translatable="yes" context="aboutdialog|credits">Credits</property> <property name="name">lbCredit</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="relief">none</property> <property name="xalign">0</property> </object> @@ -366,8 +367,8 @@ <object class="GtkLinkButton" id="btnWebsite"> <property name="label" translatable="yes" context="aboutdialog|website">Website</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="relief">none</property> <property name="xalign">0</property> <property name="uri">https://www.libreoffice.org/</property> @@ -382,8 +383,8 @@ <object class="GtkLinkButton" id="btnReleaseNotes"> <property name="label" translatable="yes" context="aboutdialog|releasenotes">Release Notes</property> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="relief">none</property> <property name="xalign">0</property> </object> @@ -395,22 +396,22 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">4</property> + <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="can_focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="lbVersionInfo"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can_focus">False</property> <property name="label" translatable="yes" context="aboutdialog|lbVersionInfo">Version Information</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">btnCopyVersion</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">btnCopyVersion</property> <property name="xalign">0</property> <attributes> <attribute name="weight" value="bold"/> @@ -425,9 +426,9 @@ <child> <object class="GtkButton" id="btnCopyVersion"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes" context="aboutdialog|btnCopyVersionTooltip">Copy all version information in English</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes" context="aboutdialog|btnCopyVersionTooltip">Copy all version information in English</property> <property name="image">imCopy</property> <accelerator key="c" signal="clicked" modifiers="GDK_CONTROL_MASK"/> </object> @@ -439,8 +440,8 @@ </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="left_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> |