Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion deepin-font-manager/interfaces/dfontbasedialog.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -58,6 +58,7 @@ void DFontBaseDialog::initUI()
m_titleBar = new QWidget(this);
m_titleBar->setFixedHeight(50);
m_titleBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_titleBar->setAccessibleName("DialogTitleBar");

m_titleBar->setLayout(titleLayout);

Expand All @@ -66,15 +67,18 @@ void DFontBaseDialog::initUI()
m_logoIcon->setFocusPolicy(Qt::NoFocus);
m_logoIcon->setAttribute(Qt::WA_TransparentForMouseEvents);
m_logoIcon->setPixmap(QIcon::fromTheme("deepin-font-manager").pixmap(QSize(32, 32)));
m_logoIcon->setAccessibleName("DialogLogoIcon");

m_closeButton = new DWindowCloseButton(this);
// m_closeButton->setFocusPolicy(Qt::NoFocus);//SP3--设置tab顺序--设置close按钮可聚焦(539)
m_closeButton->setIconSize(QSize(50, 50));
m_closeButton->setAccessibleName("DialogCloseButton");

m_tileText = new DLabel(this);
m_tileText->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_tileText->setAlignment(Qt::AlignCenter);
DFontSizeManager::instance()->bind(m_tileText, DFontSizeManager::T6);
m_tileText->setAccessibleName("DialogTitleText");

titleLayout->addWidget(m_logoIcon, 0, Qt::AlignLeft | Qt::AlignVCenter);
titleLayout->addWidget(m_tileText);
Expand Down
7 changes: 6 additions & 1 deletion deepin-font-manager/views/dfdeletedialog.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -118,6 +118,7 @@ void DFDeleteDialog::initUI()
qDebug() << "Entering function: DFDeleteDialog::initUI";
setFixedWidth(DEFAULT_WINDOW_W);
setIcon(QIcon::fromTheme("deepin-font-manager"));
setAccessibleName("DeleteConfirmDialog");

initMessageTitle();
initMessageDetail();
Expand Down Expand Up @@ -233,6 +234,7 @@ void DFDeleteDialog::initMessageDetail()
{
qDebug() << "Entering function: DFDeleteDialog::initMessageDetail";
messageDetail = new DLabel(this);
messageDetail->setAccessibleName("DeleteMessageDetail");

if (m_systemCnt == 0 && !m_hasCurFont) {
qDebug() << "Case: no system fonts, no current font in use";
Expand Down Expand Up @@ -447,6 +449,7 @@ void DFHandleTTCDialog::initUI()
{
qDebug() << "Entering function: DFHandleTTCDialog::initUI";
setFixedWidth(DEFAULT_WINDOW_W);
setAccessibleName("HandleTTCDialog");

initMessageTitle();
initMessageDetail();
Expand Down Expand Up @@ -530,9 +533,11 @@ QLayout *DFHandleTTCDialog::initBottomButtons()
m_cancelBtn = new DPushButton(this);
m_cancelBtn->setFixedSize(170, 36);
m_cancelBtn->setText(tr("Cancel"));
m_cancelBtn->setAccessibleName("TTCCancelButton");

m_confirmBtn = new DWarningButton(this);
m_confirmBtn->setFixedSize(170, 36);
m_confirmBtn->setAccessibleName("TTCConfirmButton");
setConfirmBtnText();

DVerticalLine *verticalSplite = new DVerticalLine(this);
Expand Down
4 changes: 3 additions & 1 deletion deepin-font-manager/views/dfinstallerrordialog.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -150,6 +150,7 @@ void DFInstallErrorDialog::initUI()
{
qDebug() << "Entering function: DFInstallErrorDialog::initUI";
setContentsMargins(0, 0, 0, 0);
setAccessibleName("InstallErrorDialog");
#if QT_VERSION_MAJOR > 5
setIcon(Utils::renderSVG("://exception-logo.svg", QSize(32, 32)));
#else
Expand Down Expand Up @@ -188,6 +189,7 @@ void DFInstallErrorDialog::initUI()
m_installErrorListView->setFixedWidth(width() - LISTVIEW_LEFT_SPACING * 2);
m_installErrorListView->setEditTriggers(QAbstractItemView::NoEditTriggers);
m_installErrorListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_installErrorListView->setAccessibleName("InstallErrorListView");
m_mainLayout->addWidget(m_installErrorListView);

insertButton(0, DApplication::translate("ExceptionWindow", "Exit"), false, ButtonNormal);
Expand Down
6 changes: 5 additions & 1 deletion deepin-font-manager/views/dfinstallnormalwindow.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -130,6 +130,7 @@ void DFInstallNormalWindow::initUI()
qDebug() << "Entering function: DFInstallNormalWindow::initUI";
setFixedSize(QSize(380, 136));
setTitle(DApplication::translate("NormalInstallWindow", "Install Font"));
setAccessibleName("InstallNormalWindow");

QVBoxLayout *mainLayout = new QVBoxLayout();
mainLayout->setSpacing(0);
Expand All @@ -143,16 +144,19 @@ void DFInstallNormalWindow::initUI()
DFontSizeManager::instance()->bind(m_progressStepLabel, DFontSizeManager::T6);
m_progressStepLabel->setFixedHeight(m_progressStepLabel->fontMetrics().height());
m_progressStepLabel->setText(DApplication::translate("NormalInstallWindow", "Verifying..."));
m_progressStepLabel->setAccessibleName("InstallProgressStepLabel");

m_currentFontLabel = new DTipLabel("", this);
DFontSizeManager::instance()->bind(m_currentFontLabel, DFontSizeManager::T8);
m_currentFontLabel->setAlignment(Qt::AlignLeft);
m_currentFontLabel->setFixedHeight(m_currentFontLabel->fontMetrics().height());
m_currentFontLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
m_currentFontLabel->setAccessibleName("InstallCurrentFontLabel");

m_progressBar = new DProgressBar(this);
m_progressBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_progressBar->setFixedSize(380 - 42, 6);
m_progressBar->setAccessibleName("InstallProgressBar");

contentLayout->addSpacing(10);
contentLayout->addWidget(m_progressStepLabel);
Expand Down
5 changes: 4 additions & 1 deletion deepin-font-manager/views/dfontinfodialog.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -161,6 +161,7 @@ void DFontInfoDialog::initUI()
m_mainFrame = new QWidget(this);
//m_mainFrame->setFrameShape(DFrame::Shape::NoFrame);
m_mainFrame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_mainFrame->setAccessibleName("FontInfoMainFrame");

// Font logo
m_fontLogo = new FontIconText("://font-info-logo.svg", this);
Expand All @@ -180,6 +181,7 @@ void DFontInfoDialog::initUI()
m_fontFileName->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
m_fontFileName->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
m_fontFileName->setMinimumHeight(m_fontFileName->fontMetrics().height());
m_fontFileName->setAccessibleName("FontInfoFileName");
// m_fontFileName->setWordWrap(true);

DFontSizeManager::instance()->bind(m_fontFileName, DFontSizeManager::T8);
Expand All @@ -197,6 +199,7 @@ void DFontInfoDialog::initUI()
m_fontFileName->setPalette(pa);

m_scrollArea = new QScrollArea(this);
m_scrollArea->setAccessibleName("FontInfoScrollArea");
// scrollArea->setLineWidth(120);
m_scrollArea->setFixedSize(QSize(290, 375));
// scrollArea->setContentsMargins(0,0,30,0);
Expand Down
3 changes: 2 additions & 1 deletion deepin-font-manager/views/dfontinfoscrollarea.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -137,6 +137,7 @@ BITSTREAM CHARTER is a registered trademark of Bitstream Inc.";
vLayout->setContentsMargins(10, 10, 10, 10);
basicLabel = new DLabel(DApplication::translate("FontDetailDailog", "Basic info"));
DFontSizeManager::instance()->bind(basicLabel, DFontSizeManager::T6);
basicLabel->setAccessibleName("BasicInfoLabel");

vLayout->addWidget(basicLabel);
vLayout->addItem(gridLayout);
Expand Down
18 changes: 17 additions & 1 deletion deepin-font-manager/views/dfontmgrmainwindow.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -157,6 +157,7 @@ void DFontMgrMainWindow::initUI()
qDebug() << "Entering function: DFontMgrMainWindow::initUI";
//Enable main window accept drag event
setAcceptDrops(true);
setAccessibleName("FontManagerMainWindow");
//m_loadingSpinner = new DSpinner(this);
//m_loadingSpinner->setFixedSize(32, 32);
//m_loadingSpinner->hide();
Expand Down Expand Up @@ -667,6 +668,7 @@ void DFontMgrMainWindow::initTileFrame()

//Action area add a extra space
d->titleActionArea = new QWidget(this);
d->titleActionArea->setAccessibleName("TitleActionArea");

QHBoxLayout *titleActionAreaLayout = new QHBoxLayout(d->titleActionArea);
titleActionAreaLayout->setSpacing(0);
Expand All @@ -675,6 +677,7 @@ void DFontMgrMainWindow::initTileFrame()
// Add Font
d->addFontButton = new DIconButton(DStyle::StandardPixmap::SP_IncreaseElement, this);
d->addFontButton->setFlat(false);
d->addFontButton->setAccessibleName("AddFontButton");

titleActionAreaLayout->addWidget(d->addFontButton);

Expand All @@ -683,6 +686,7 @@ void DFontMgrMainWindow::initTileFrame()
DFontSizeManager::instance()->bind(d->searchFontEdit, DFontSizeManager::T6);
d->searchFontEdit->setFixedWidth(FTM_SEARCH_BAR_W);
d->searchFontEdit->setPlaceHolder(DApplication::translate("SearchBar", "Search"));
d->searchFontEdit->setAccessibleName("SearchFontEdit");

titlebar()->addWidget(d->titleActionArea, Qt::AlignLeft | Qt::AlignVCenter);
qDebug() << "Exiting function: DFontMgrMainWindow::initTileFrame";
Expand All @@ -703,6 +707,7 @@ void DFontMgrMainWindow::initMainVeiws()
setWindowIcon(QIcon::fromTheme(DEEPIN_FONT_MANAGER));

d->mainWndSpliter = new DSplitter(Qt::Horizontal, this);
d->mainWndSpliter->setAccessibleName("MainWindowSplitter");
m_fontLoadingSpinner = new DFontSpinnerWidget(this);

initLeftSideBar();
Expand Down Expand Up @@ -746,6 +751,7 @@ void DFontMgrMainWindow::initLeftSideBar()
qDebug() << "Entering function: DFontMgrMainWindow::initLeftSideBar";
d->leftBarHolder = new QWidget(d->mainWndSpliter);
d->leftBarHolder->setObjectName("leftMainLayoutHolder");
d->leftBarHolder->setAccessibleName("LeftBarHolder");
d->leftBarHolder->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
d->leftBarHolder->setFixedWidth(FTM_LEFT_SIDE_BAR_WIDTH);
d->leftBarHolder->setContentsMargins(0, 0, 2, 0);
Expand Down Expand Up @@ -796,6 +802,7 @@ void DFontMgrMainWindow::initRightFontView()
d->rightViewHolder = new QWidget(d->mainWndSpliter);
d->rightViewHolder->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
d->rightViewHolder->setObjectName("rightMainLayoutHolder");
d->rightViewHolder->setAccessibleName("RightViewHolder");
d->rightViewHolder->setBackgroundRole(DPalette::Base);
d->rightViewHolder->setAutoFillBackground(true);

Expand All @@ -806,13 +813,15 @@ void DFontMgrMainWindow::initRightFontView()
d->fontShowArea = new QWidget(this);
//d->fontShowArea->setFrameShape(DFrame::NoFrame);
d->fontShowArea->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
d->fontShowArea->setAccessibleName("FontShowArea");

initFontPreviewListView(d->fontShowArea);

// initialize statebar shadow line
d->sbarShadowLine = new DHorizontalLine(this);
d->sbarShadowLine->setFixedHeight(1);
d->sbarShadowLine->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
d->sbarShadowLine->setAccessibleName("StateBarShadowLine");

rightMainLayout->addWidget(d->fontShowArea);
rightMainLayout->addWidget(d->sbarShadowLine);
Expand Down Expand Up @@ -853,6 +862,7 @@ void DFontMgrMainWindow::initFontPreviewListView(QWidget *parent)
parent->setLayout(listViewVBoxLayout);

m_fontPreviewListView = new DFontPreviewListView(this);
m_fontPreviewListView->setAccessibleName("FontPreviewListView");
m_fontPreviewListView->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
m_fontPreviewListView->setVerticalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAsNeeded);
m_fontPreviewListView->setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy::ScrollBarAlwaysOff);
Expand All @@ -872,6 +882,7 @@ void DFontMgrMainWindow::initFontPreviewListView(QWidget *parent)

// 未搜索到结果view
m_noResultListView = new DListView(this);
m_noResultListView->setAccessibleName("NoResultListView");

DLabel *noResultLabel = new DLabel(m_noResultListView);
noResultLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
Expand All @@ -894,6 +905,7 @@ void DFontMgrMainWindow::initFontPreviewListView(QWidget *parent)

// 未安装字体view
m_noInstallListView = new DListView(this);
m_noInstallListView->setAccessibleName("NoInstallListView");

DLabel *noInstallLabel = new DLabel(m_noInstallListView);
noInstallLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
Expand Down Expand Up @@ -936,19 +948,22 @@ void DFontMgrMainWindow::initStateBar()
d->stateBar = new QWidget(this);
d->stateBar->setFixedHeight(FTM_SBAR_HEIGHT);
d->stateBar->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
d->stateBar->setAccessibleName("StateBar");

d->textInputEdit = new DLineEdit(this);
DFontSizeManager::instance()->bind(d->textInputEdit, DFontSizeManager::T6);
d->textInputEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
d->textInputEdit->setClearButtonEnabled(true);
d->textInputEdit->lineEdit()->setPlaceholderText(DApplication::translate("StateBar", "Input preview text"));
d->textInputEdit->setAccessibleName("TextInputEdit");

d->fontScaleSlider = new DSlider(Qt::Orientation::Horizontal, this);
d->fontScaleSlider->setFixedSize(FTM_SBAR_SLIDER_W, FTM_SBAR_SLIDER_H);
d->fontScaleSlider->setMinimum(MIN_FONT_SIZE);
d->fontScaleSlider->setMaximum(MAX_FONT_SIZE);
//设置初始显示字体大小
d->fontScaleSlider->setValue(DEFAULT_FONT_SIZE);
d->fontScaleSlider->setAccessibleName("FontScaleSlider");
setTabOrder(d->textInputEdit->lineEdit(), d->fontScaleSlider);

d->fontSizeLabel = new DLabel(this);
Expand All @@ -957,6 +972,7 @@ void DFontMgrMainWindow::initStateBar()
d->fontSizeLabel->setFont(fontScaleFont);
d->fontSizeLabel->setFixedSize(FTM_SBAR_FSIZE_LABEL_W, FTM_SBAR_FSIZE_LABEL_H);
d->fontSizeLabel->setAlignment(Qt::AlignCenter | Qt::AlignVCenter);
d->fontSizeLabel->setAccessibleName("FontSizeLabel");

DFontSizeManager::instance()->bind(d->fontSizeLabel, DFontSizeManager::T6);
// Init the default font size
Expand Down
4 changes: 3 additions & 1 deletion deepin-font-manager/views/dfontspinnerwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -34,8 +34,10 @@ void DFontSpinnerWidget::initUI()
qDebug() << "Entering function: void DFontSpinnerWidget::initUI";
m_spinner = new DFontSpinner(this);
m_spinner->setFixedSize(QSize(32, 32));
m_spinner->setAccessibleName("FontSpinnerAnimation");
m_label = new QLabel(this);
m_label->setText(DApplication::translate("Main", "Loading fonts, please wait..."));
m_label->setAccessibleName("FontSpinnerLabel");

QHBoxLayout *hLoadingView = new QHBoxLayout;
hLoadingView->addStretch(1);
Expand Down
8 changes: 7 additions & 1 deletion deepin-font-manager/views/dfquickinstallwindow.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd.
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd.
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -62,6 +62,7 @@ void DFQuickInstallWindow::initUI()
titlebar()->setMenuVisible(false);

setFixedSize(QSize(DEFAULT_WINDOW_W, DEFAULT_WINDOW_H));
setAccessibleName("QuickInstallWindow");

//Set task bar icon
setWindowIcon(QIcon::fromTheme(DEEPIN_FONT_MANAGER));
Expand All @@ -76,6 +77,7 @@ void DFQuickInstallWindow::initUI()
m_titleLabel = new DLabel(this);
m_titleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
m_titleLabel->setText(DApplication::translate("QuickInstallWindow", "Unknown"));
m_titleLabel->setAccessibleName("QuickInstallTitle");

titlebar()->addWidget(m_titleLabel, Qt::AlignBottom | Qt::AlignHCenter);

Expand All @@ -86,9 +88,11 @@ void DFQuickInstallWindow::initUI()
// Style combox
m_fontType = new DComboBox(this);
m_fontType->setFixedSize(QSize(114, 36));
m_fontType->setAccessibleName("QuickInstallFontType");

// Text Preview
m_fontPreviewTxt = new DFontPreviewer(this);
m_fontPreviewTxt->setAccessibleName("QuickInstallFontPreview");
// m_fontPreviewTxt->setFixedSize(QSize(381, 216));

// m_fontPreviewTxt->setFixedHeight(216);
Expand All @@ -108,6 +112,7 @@ void DFQuickInstallWindow::initUI()
m_stateLabel = new DLabel(this);
m_stateLabel->setFixedHeight(m_stateLabel->fontMetrics().height());
m_stateLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_stateLabel->setAccessibleName("QuickInstallStateLabel");
// m_stateLabel->setFont(actionFont);
#if QT_VERSION_MAJOR > 5
DPalette pa = m_stateLabel->palette();
Expand All @@ -124,6 +129,7 @@ void DFQuickInstallWindow::initUI()
m_actionBtn = new DPushButton(this);
m_actionBtn->setFixedSize(QSize(120, 40));
m_actionBtn->setFocusPolicy(Qt::FocusPolicy::NoFocus);
m_actionBtn->setAccessibleName("QuickInstallActionButton");
// m_actionBtn->setFont(actionFont);
m_actionBtn->setText(DApplication::translate("QuickInstallWindow", "Install Font"));

Expand Down
Loading
Loading