Skip to content

fix: cache printer names to avoid repeated queries #776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
18202781743 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: cache printer names to avoid repeated queries #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions src/widgets/dprintpreviewdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,9 +1015,9 @@

void DPrintPreviewDialogPrivate::initdata()
{
Q_Q(DPrintPreviewDialog);

Check warning on line 1018 in src/widgets/dprintpreviewdialog.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Variable 'q' can be declared as pointer to const
QStringList itemlist;
itemlist << QPrinterInfo::availablePrinterNames()
itemlist << availablePrinterNames()
<< qApp->translate("DPrintPreviewDialogPrivate", "Print to PDF")
<< qApp->translate("DPrintPreviewDialogPrivate", "Save as Image");
printDeviceCombo->addItems(itemlist);
Expand Down Expand Up @@ -1293,6 +1293,12 @@
QObject::connect(copycountspinbox->lineEdit(), SIGNAL(textEdited(const QString &)), q, SLOT(_q_spinboxValueEmptyChecked(const QString &)));
QObject::connect(scaleRateEdit->lineEdit(), SIGNAL(textEdited(const QString &)), q, SLOT(_q_spinboxValueEmptyChecked(const QString &)));
QObject::connect(inclinatBox->lineEdit(), SIGNAL(textEdited(const QString &)), q, SLOT(_q_spinboxValueEmptyChecked(const QString &)));

QObject::connect(q, &DPrintPreviewDialog::finished, q, [this]() {
qDebug(dPrintPreview) << "DPrintPreviewDialog finished, clear printerNames";
printerNames.clear();
printerNamesInited = false;
});
}

void DPrintPreviewDialogPrivate::setfrmaeback(DFrame *frame)
Expand Down Expand Up @@ -2249,10 +2255,20 @@
}
}

QStringList DPrintPreviewDialogPrivate::availablePrinterNames()
{
if (!printerNamesInited) {
qDebug(dPrintPreview) << "Get printer names from QPrinterInfo.";
printerNamesInited = true;
printerNames = QPrinterInfo::availablePrinterNames();
qDebug(dPrintPreview) << "Available printer names:" << printerNames;
}
return printerNames;
}

bool DPrintPreviewDialogPrivate::isActualPrinter(const QString &name)
{
const QStringList &printerNames = QPrinterInfo::availablePrinterNames();
return printerNames.contains(name);
return availablePrinterNames().contains(name);
}

QString DPrintPreviewDialogPrivate::getColorModeConfig(const QString &printer)
Expand Down
5 changes: 4 additions & 1 deletion src/widgets/private/dprintpreviewdialog_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2019 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -92,6 +92,7 @@ class DPrintPreviewDialogPrivate : public DDialogPrivate
void setPageLayoutEnable(const bool &checked);
void matchFitablePageSize();
bool isActualPrinter(const QString &name);
QStringList availablePrinterNames();
QString getColorModeConfig(const QString &printer);
void saveColorModeConfig(const QString &printer, const QString &colorMode);

Expand Down Expand Up @@ -189,6 +190,8 @@ class DPrintPreviewDialogPrivate : public DDialogPrivate
DSpinBox *opaBox = nullptr;
QVector<qreal> marginOldValue; // 记录margin自定义时的旧值 如果旧值和新值一致，就不需要刷新，top left right bottom
QList<qreal> minnumMargins;
QStringList printerNames;
bool printerNamesInited = false;
QSpacerItem *spacer = nullptr;
QSpacerItem *wmSpacer = nullptr;
DFloatingWidget *colorWidget = nullptr;
Expand Down
Loading