summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
Diffstat (limited to 'cui')
-rw-r--r--cui/inc/strings.hrc2
-rw-r--r--cui/source/dialogs/about.cxx11
-rw-r--r--cui/uiconfig/ui/aboutdialog.ui20
3 files changed, 19 insertions, 14 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index df99edb217b2..fb5a67ef015d 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -386,7 +386,7 @@
#define RID_SVXSTR_ABOUT_VENDOR NC_("aboutdialog|vendor", "This release was supplied by %OOOVENDOR.")
#define RID_SVXSTR_ABOUT_BASED_ON NC_("aboutdialog|libreoffice", "LibreOffice was based on OpenOffice.org.")
#define RID_SVXSTR_ABOUT_DERIVED NC_("aboutdialog|derived", "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org")
-#define RID_SVXSTR_ABOUT_UILOCALE NC_("aboutdialog|uilocale", "UI-Language: $LOCALE")
+#define RID_SVXSTR_ABOUT_UILOCALE NC_("aboutdialog|uilocale", "UI: $LOCALE")
#define RID_SVXSTR_EDIT_PATHS NC_("optpathspage|editpaths", "Edit Paths: %1")
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index c07a8c964586..953670ffa7ae 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -71,10 +71,13 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pVersionLabel->set_label(GetVersionString());
OUString sbuildId = GetBuildString();
+ const long nMaxChar = 25;
if (IsStringValidGitHash(sbuildId)) {
- m_pBuildLabel->set_label(sbuildId);
- m_pBuildLabel->set_uri(
- "https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=" + sbuildId);
+ m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h="
+ + sbuildId);
+ m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ? sbuildId.replaceAt(
+ nMaxChar, sbuildId.getLength() - nMaxChar, "...")
+ : sbuildId);
} else {
m_pBuildCaption->hide();
m_pBuildLabel->hide();
@@ -104,7 +107,7 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pBrandImage->set_image(m_pVirDev.get());
m_pVirDev.disposeAndClear();
}
- if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth)) {
+ if (SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, nWidth * 0.9)) {
ScopedVclPtr<VirtualDevice> m_pVirDev =
m_pAboutImage->create_virtual_device();
m_pVirDev->SetOutputSizePixel(aBackgroundBitmap.GetSizePixel());
diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui
index 5f3610856e34..9c4dee2e2d70 100644
--- a/cui/uiconfig/ui/aboutdialog.ui
+++ b/cui/uiconfig/ui/aboutdialog.ui
@@ -76,7 +76,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="margin_left">12</property>
- <property name="margin_right">12</property>
+ <property name="margin_right">24</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
</object>
@@ -116,8 +116,7 @@
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="aboutdialog|lbVersion">Version:</property>
<property name="wrap">True</property>
- <property name="max_width_chars">50</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -130,7 +129,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="aboutdialog|lbBuild">Build:</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -143,7 +142,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="aboutdialog|lbEnvironment">Environment:</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -196,7 +195,8 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="aboutdialog|lbExtra">Misc:</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -209,6 +209,8 @@
<property name="can_focus">False</property>
<property name="xpad">6</property>
<property name="label">Calc</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">25</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -222,7 +224,7 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes" context="aboutdialog|lbLocale">Locale:</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -247,7 +249,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="aboutdialog|lbUI">User Interface:</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -319,10 +321,10 @@ LibreOffice was based on OpenOffice.org</property>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="homogeneous">True</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>
generated by cgit (git 2.34.1) at 2024-07-08 00:13:56 +0000