pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-linux] cprintdata: fix current printer selection

Browse Source
This commit is contained in:
SimplestStudio
2025-03-31 14:07:33 +03:00
parent de796e7c67
commit bd5897b749
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
win-linux/src/cprintdata.cpp
View File

@ -45,6 +45,19 @@
# include <cups/ppd.h>
#endif
static QString getFirstPrinterName(const QJsonObject &json)
{
if (json.contains("printers")) {
QJsonArray jarr = json["printers"].toArray();
if (!jarr.isEmpty()) {
QJsonObject jobj = jarr.at(0).toObject();
return jobj["name"].toString();
}
}
return QString();
}
class CPrintData::CPrintDataPrivate : public QObject
{
Q_OBJECT
@ -430,8 +443,12 @@ bool CPrintData::printerCapabilitiesReady() const
QString CPrintData::getPrinterCapabilitiesJson() const
{
if (!m_priv->printers_capabilities_json.isEmpty())
m_priv->printers_capabilities_json["current_printer"] = printerInfo().printerName();
if (!m_priv->printers_capabilities_json.isEmpty()) {
QString currentPrinterName = printerInfo().printerName();
if (currentPrinterName.isEmpty())
currentPrinterName = getFirstPrinterName(m_priv->printers_capabilities_json);
m_priv->printers_capabilities_json["current_printer"] = currentPrinterName;
}
return QJsonDocument(m_priv->printers_capabilities_json).toJson(QJsonDocument::Compact);
}
@ -440,7 +457,10 @@ auto CPrintData::queryPrinterCapabilitiesAsync(const FnVoidStr &callback) const
m_priv->m_query_callback = callback;
m_priv->m_future = std::async(std::launch::async, [=]() {
QJsonObject json = m_priv->getPrintersCapabilitiesJson();
json["current_printer"] = printerInfo().printerName();
QString currentPrinterName = printerInfo().printerName();
if (currentPrinterName.isEmpty())
currentPrinterName = getFirstPrinterName(json);
json["current_printer"] = currentPrinterName;
QMetaObject::invokeMethod(m_priv, "onPrinterCapabilitiesReady", Qt::QueuedConnection, Q_ARG(QJsonObject, json));
});
}