From 75199e0827ac5d0a70f8d68a0bb6e5dd1da7f70c Mon Sep 17 00:00:00 2001 From: muyuankai Date: Tue, 12 Mar 2024 16:36:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=99=A8=E7=89=88=E6=9D=83\=E8=AE=B8=E5=8F=AF=E8=AF=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 字体安装器版权\许可证信息展示 Log: 字体安装器版权\许可证信息展示 --- .../views/dfontinfoscrollarea.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/deepin-font-manager/views/dfontinfoscrollarea.cpp b/deepin-font-manager/views/dfontinfoscrollarea.cpp index a90cdd08..58e8a3cb 100644 --- a/deepin-font-manager/views/dfontinfoscrollarea.cpp +++ b/deepin-font-manager/views/dfontinfoscrollarea.cpp @@ -45,6 +45,10 @@ dfontinfoscrollarea::dfontinfoscrollarea(DFontPreviewItemData *pData, DWidget * *************************************************************************/ void dfontinfoscrollarea::initUi() { + QStringList sFontList; + sFontList << "Bitstream Charter-Regular" << "Bitstream Charter-Bold" << "Bitstream Charter-Italic" + <<"Bitstream Charter-Bold Italic" << "Courier 10 Pitch-Italic" << "Courier 10 Pitch-Bold Italic" + << "Courier 10 Pitch-Regular" << "Courier 10 Pitch-Bold"; auto gridLayout = new QGridLayout; gridLayout->setContentsMargins(0, 6, 0, 6); gridLayout->setSpacing(3); @@ -55,14 +59,25 @@ void dfontinfoscrollarea::initUi() , DApplication::translate("FontDetailDailog", m_fontInfo->fontInfo.type.toLatin1())); if (m_fontInfo->fontInfo.version.isEmpty()) { QString version = "Copyright 2014~2015 Adobe Syste-ms Incorporated (http://www.adob.com/), with Reserved Font Name cc Source."; + if(sFontList.contains(m_fontInfo->fontData.strFontName)) { + version = "Copyright 1989-1992, Bitstream Inc., Cambridge, MA."; + } createLabel(gridLayout, 2, DApplication::translate("FontDetailDailog", "Version"), version); } else { createLabel(gridLayout, 2, DApplication::translate("FontDetailDailog", "Version") , m_fontInfo->fontInfo.version); } if (m_fontInfo->fontInfo.description.isEmpty()) { - createLabel(gridLayout, 3, DApplication::translate("FontDetailDailog", "Description") - , DApplication::translate("FontDetailDailog", "Unknown")); + if(!sFontList.contains(m_fontInfo->fontData.strFontName)) { + createLabel(gridLayout, 3, DApplication::translate("FontDetailDailog", "Description") + , DApplication::translate("FontDetailDailog", "Unknown")); + } else { + createLabel(gridLayout, 3, DApplication::translate("FontDetailDailog", "Description") + , DApplication::translate("FontDetailDailog", "You are hereby granted permission under all Bitstream propriety rights to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream Charter (r) \ +Type 1 outline fonts and the 4 Courier Type 1 outline fonts for any purpose and without restriction; \ +provided, that this notice is left intact on all copies of such fonts and that Bitstream's trademark is acknowledged as shown below on all unmodified copies of the 4 Charter Type 1 fonts. \ +BITSTREAM CHARTER is a registered trademark of Bitstream Inc.")); + } } else { createLabel(gridLayout, 3, DApplication::translate("FontDetailDailog", "Description") , m_fontInfo->fontInfo.description);