cui/source/dialogs/AdditionsDialog.cxx | 5 ++++-
cui/uiconfig/ui/additionsfragment.ui | 14 +++++++-------
2 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 6379f799704935a571a4b3af44cabd0671c48dbe
Author: Yusuf Keten <ketenyu...@gmail.com>
AuthorDate: Fri Aug 28 13:57:57 2020 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Sun Aug 30 19:44:40 2020 +0200
tdf#135273: Tight integration dialog shows unclear properties
When there is no info about the author of the extension, the label was NULL.
If it is null, it will be empty after this patch.
The initial label of the labelAuthor is cleared. Also, unnecessary
translatable expressions in the additionsfragment.ui were deleted.
Change-Id: Iab9517f1b3ff5d8c6b3947d7b29c897c18e94664
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101537
Tested-by: Muhammet Kara <muhammet.k...@collabora.com>
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index 7d26416c910c..3586704a1e9b 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -685,7 +685,10 @@ AdditionsItem::AdditionsItem(weld::Widget* pParent,
AdditionsDialog* pParentDial
m_xLinkButtonName->set_uri(additionInfo.sExtensionURL);
m_xLabelDescription->set_label(additionInfo.sIntroduction);
- m_xLabelAuthor->set_label(additionInfo.sAuthorName);
+
+ if (!additionInfo.sAuthorName.equalsIgnoreAsciiCase("null"))
+ m_xLabelAuthor->set_label(additionInfo.sAuthorName);
+
m_xButtonInstall->set_label(CuiResId(RID_SVXSTR_ADDITIONS_INSTALLBUTTON));
OUString sLicenseString = CuiResId(RID_SVXSTR_ADDITIONS_LICENCE) +
additionInfo.sLicense;
m_xLabelLicense->set_label(sLicenseString);
diff --git a/cui/uiconfig/ui/additionsfragment.ui
b/cui/uiconfig/ui/additionsfragment.ui
index 93c8e50ad126..cc1701dfce82 100644
--- a/cui/uiconfig/ui/additionsfragment.ui
+++ b/cui/uiconfig/ui/additionsfragment.ui
@@ -77,7 +77,7 @@
<property name="baseline_position">top</property>
<child>
<object class="GtkLinkButton" id="linkButtonName">
- <property name="label" translatable="yes"
context="additionsEntry|linkButtonName">button</property>
+ <property name="label">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -97,7 +97,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelAuthor">label</property>
+ <property name="label"></property>
</object>
<packing>
<property name="expand">False</property>
@@ -125,7 +125,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelDescription">label</property>
+ <property name="label">label</property>
<property name="wrap">True</property>
<property name="wrap_mode">word-char</property>
<property name="width_chars">1</property>
@@ -146,7 +146,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_top">3</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelLicense">label</property>
+ <property name="label">label</property>
</object>
<packing>
<property name="expand">False</property>
@@ -160,7 +160,7 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_top">3</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelVersion">label</property>
+ <property name="label">label</property>
</object>
<packing>
<property name="expand">False</property>
@@ -187,7 +187,7 @@
</child>
<child>
<object class="GtkLinkButton" id="linkButtonComments">
- <property name="label" translatable="yes"
context="additionsEntry|linkButtonComments">button</property>
+ <property name="label">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -338,7 +338,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="label" translatable="yes"
context="additionsEntry|labelDownloader">label</property>
+ <property name="label">label</property>
<accessibility>
<relation type="label-for" target="imageDownloadNumber"/>
</accessibility>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
