Hello community,
here is the log from the commit of package kde4-print-manager for
openSUSE:Factory checked in at 2013-06-11 06:08:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kde4-print-manager (Old)
and /work/SRC/openSUSE:Factory/.kde4-print-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde4-print-manager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kde4-print-manager/kde4-print-manager.changes
2013-05-16 16:48:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kde4-print-manager.new/kde4-print-manager.changes
2013-06-11 09:30:51.000000000 +0200
@@ -1,0 +2,8 @@
+Sat Jun 1 17:37:22 UTC 2013 - [email protected]
+
+- Update to 4.10.4
+ * Bugfix release
+ * See http://www.kde.org/announcements/announce-4.10.4.php
+ * resolves bnc#8122760
+
+-------------------------------------------------------------------
Old:
----
print-manager-4.10.3.tar.xz
New:
----
print-manager-4.10.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-print-manager.spec ++++++
--- /var/tmp/diff_new_pack.bSnWfj/_old 2013-06-11 09:30:52.000000000 +0200
+++ /var/tmp/diff_new_pack.bSnWfj/_new 2013-06-11 09:30:52.000000000 +0200
@@ -30,7 +30,7 @@
Summary: A new print manager for KDE 4
License: GPL-2.0+
Group: System/GUI/KDE
-Version: 4.10.3
+Version: 4.10.4
Release: 0
Source: print-manager-%{version}.tar.xz
Obsoletes: kde4-printer-applet < 4.9.80
++++++ print-manager-4.10.3.tar.xz -> print-manager-4.10.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.3/add-printer/PageAddPrinter.cpp
new/print-manager-4.10.4/add-printer/PageAddPrinter.cpp
--- old/print-manager-4.10.3/add-printer/PageAddPrinter.cpp 2013-05-03
06:43:18.000000000 +0200
+++ new/print-manager-4.10.4/add-printer/PageAddPrinter.cpp 2013-05-28
21:30:34.000000000 +0200
@@ -118,6 +118,8 @@
{
bool ret = false;
QVariantHash args = values();
+ args[KCUPS_PRINTER_IS_ACCEPTING_JOBS] = true;
+ args[KCUPS_PRINTER_STATE] = IPP_PRINTER_IDLE;
// Check if it's a printer or a class that we are adding
bool isClass = !args.take(ADDING_PRINTER).toBool();
@@ -126,8 +128,6 @@
QPointer<KCupsRequest> request = new KCupsRequest;
if (isClass) {
- args[KCUPS_PRINTER_IS_ACCEPTING_JOBS] = true;
- args[KCUPS_PRINTER_STATE] = IPP_PRINTER_IDLE;
request->addOrModifyClass(destName, args);
} else {
request->addOrModifyPrinter(destName, args, filename);
@@ -150,15 +150,6 @@
request->deleteLater();
}
- if (ret) {
- // For some reason CUPS sometimes (AppleSocket?)
- // adds printers paused and rejecting jobs
- // this makes sure they are fine
- if (resumePrinter(destName)) {
- acceptJobs(destName);
- }
- }
-
return ret;
}
@@ -179,30 +170,6 @@
emit allowProceed(!text.isEmpty());
}
-bool PageAddPrinter::resumePrinter(const QString &printer)
-{
- QPointer<KCupsRequest> request = new KCupsRequest;
- request->resumePrinter(printer);
- request->waitTillFinished();
- if (request) {
- request->deleteLater();
- return true;
- }
- return false;
-}
-
-bool PageAddPrinter::acceptJobs(const QString &printer)
-{
- QPointer<KCupsRequest> request = new KCupsRequest;
- request->acceptJobs(printer);
- request->waitTillFinished();
- if (request) {
- request->deleteLater();
- return true;
- }
- return false;
-}
-
void PageAddPrinter::checkSelected()
{
// emit allowProceed(!devicesLV->selectionModel()->selection().isEmpty());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.3/add-printer/PageAddPrinter.h
new/print-manager-4.10.4/add-printer/PageAddPrinter.h
--- old/print-manager-4.10.3/add-printer/PageAddPrinter.h 2013-05-03
06:43:18.000000000 +0200
+++ new/print-manager-4.10.4/add-printer/PageAddPrinter.h 2013-05-28
21:30:34.000000000 +0200
@@ -48,9 +48,6 @@
void on_nameLE_textChanged(const QString &text);
private:
- bool resumePrinter(const QString &printer);
- bool acceptJobs(const QString &printer);
-
Ui::PageAddPrinter *ui;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.3/libkcups/ClassListWidget.cpp
new/print-manager-4.10.4/libkcups/ClassListWidget.cpp
--- old/print-manager-4.10.3/libkcups/ClassListWidget.cpp 2013-05-03
06:43:18.000000000 +0200
+++ new/print-manager-4.10.4/libkcups/ClassListWidget.cpp 2013-05-28
21:30:34.000000000 +0200
@@ -66,11 +66,11 @@
att << KCUPS_PRINTER_URI_SUPPORTED;
// Get destinations with these masks
m_request = new KCupsRequest;
+ connect(m_request, SIGNAL(finished()), this, SLOT(loadFinished()));
m_request->setProperty("reqDestName", reqDestName);
m_request->setProperty("memberNames", memberNames);
m_request->getPrinters(att,
CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
CUPS_PRINTER_IMPLICIT);
- connect(m_request, SIGNAL(finished()), this, SLOT(loadFinished()));
m_busySeq->start(); // Start spining
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.3/libkcups/KCupsConnection.h
new/print-manager-4.10.4/libkcups/KCupsConnection.h
--- old/print-manager-4.10.3/libkcups/KCupsConnection.h 2013-05-03
06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/libkcups/KCupsConnection.h 2013-05-28
21:30:34.000000000 +0200
@@ -51,7 +51,7 @@
#define KCUPS_PRINTER_TYPE "printer-type"
#define KCUPS_PRINTER_TYPE_MASK "printer-type-mask"
#define KCUPS_PRINTER_COMMANDS "printer-commands"
-#define KCUPS_PRINTER_URI_SUPPORTED "printer-supported"
+#define KCUPS_PRINTER_URI_SUPPORTED "printer-uri-supported"
#define KCUPS_PRINTER_ERROR_POLICY "printer-error-policy"
#define KCUPS_PRINTER_ERROR_POLICY_SUPPORTED "printer-error-policy-supported"
#define KCUPS_PRINTER_OP_POLICY "printer-op-policy"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.3/plasmoid-package/metadata.desktop
new/print-manager-4.10.4/plasmoid-package/metadata.desktop
--- old/print-manager-4.10.3/plasmoid-package/metadata.desktop 2013-05-03
06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/plasmoid-package/metadata.desktop 2013-05-28
21:30:34.000000000 +0200
@@ -9,7 +9,7 @@
Name[es]=Gestión de trabajos de impresión
Name[et]=Trükitööde haldus
Name[fi]=Tulostustöiden hallinta
-Name[fr]=Gestion des tâches d'impression
+Name[fr]=Gère les tâches d'impression
Name[ga]=Bainistigh Jabanna Priontála
Name[gl]=Xestionar os traballos de impresión
Name[hu]=Nyomtatási feladatok kezelése
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.3/print-manager-kded/printmanager.notifyrc
new/print-manager-4.10.4/print-manager-kded/printmanager.notifyrc
--- old/print-manager-4.10.3/print-manager-kded/printmanager.notifyrc
2013-05-03 06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/print-manager-kded/printmanager.notifyrc
2013-05-28 21:30:34.000000000 +0200
@@ -10,7 +10,7 @@
Name[es]=Gestor de impresión
Name[et]=Trükkimise haldur
Name[fi]=Tulostuksenhallinta
-Name[fr]=printmanager
+Name[fr]=gestionnaire d'impression
Name[ga]=Bainisteoir Priontála
Name[gl]=Xestor da impresión
Name[hu]=printmanager
@@ -51,7 +51,7 @@
Comment[es]=Informa cuando se detecta una nueva impresora
Comment[et]=Teavitamine uue printeri tuvastamisest
Comment[fi]=Ilmoittaa, kun havaitaan uusi tulostin
-Comment[fr]=Notifie lors de la détection d'une nouvelle imprimante
+Comment[fr]=Envoie une notification lors de la détection d'une nouvelle
imprimante
Comment[gl]=Notifícao cando se detecta unha nova impresora.
Comment[hu]=Értesítés új nyomtató észleléséről
Comment[ia]=Notifica quando un nove imprimitor es relevate
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.3/printer-manager-kcm/PrintKCM.cpp
new/print-manager-4.10.4/printer-manager-kcm/PrintKCM.cpp
--- old/print-manager-4.10.3/printer-manager-kcm/PrintKCM.cpp 2013-05-03
06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/printer-manager-kcm/PrintKCM.cpp 2013-05-28
21:30:34.000000000 +0200
@@ -64,6 +64,8 @@
KGlobal::insertCatalog(QLatin1String("print-manager"));
ui->setupUi(this);
+
+ connect(ui->printerDesc, SIGNAL(updateNeeded()), SLOT(update()));
QMenu *addMenu = new QMenu(this);
addMenu->addAction(i18nc("@action:intoolbar","Add a Printer Class"),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.3/printer-manager-kcm/PrinterDescription.cpp
new/print-manager-4.10.4/printer-manager-kcm/PrinterDescription.cpp
--- old/print-manager-4.10.3/printer-manager-kcm/PrinterDescription.cpp
2013-05-03 06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/printer-manager-kcm/PrinterDescription.cpp
2013-05-28 21:30:34.000000000 +0200
@@ -90,43 +90,29 @@
void PrinterDescription::on_defaultCB_clicked()
{
- bool isDefault = ui->defaultCB->isChecked();
- QPointer<KCupsRequest> request = new KCupsRequest;
+ ui->defaultCB->setDisabled(true);
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
request->setDefaultPrinter(m_destName);
- request->waitTillFinished();
- if (request) {
- setIsDefault(request->hasError() ? !isDefault : isDefault);
- request->deleteLater();
- }
}
void PrinterDescription::on_sharedCB_clicked()
{
- bool shared = ui->sharedCB->isChecked();
- QPointer<KCupsRequest> request = new KCupsRequest;
- request->setShared(m_destName, m_isClass, shared);
- request->waitTillFinished();
- if (request) {
- setIsShared(request->hasError() ? !shared : shared);
- request->deleteLater();
- }
+ ui->sharedCB->setDisabled(true);
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
+ request->setShared(m_destName, m_isClass, ui->sharedCB->isChecked());
}
void PrinterDescription::on_rejectPrintJobsCB_clicked()
{
- bool accepting = !ui->rejectPrintJobsCB->isChecked();
- kDebug() << accepting;
- QPointer<KCupsRequest> request = new KCupsRequest;
- if (accepting) {
- request->acceptJobs(m_destName);
- } else {
+ ui->rejectPrintJobsCB->setDisabled(true);
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
+ if (ui->rejectPrintJobsCB->isChecked()) {
request->rejectJobs(m_destName);
-
- }
- request->waitTillFinished();
- if (request) {
- setAcceptingJobs(request->hasError() ? !accepting : accepting);
- request->deleteLater();
+ } else {
+ request->acceptJobs(m_destName);
}
}
@@ -177,13 +163,17 @@
void PrinterDescription::setIsShared(bool isShared)
{
m_isShared = isShared;
- if (ui->sharedCB->isEnabled()) {
- ui->sharedCB->setChecked(m_isShared);
+ if (m_globalShared) {
+ ui->sharedCB->setChecked(isShared);
+ } else {
+ ui->sharedCB->setChecked(false);
}
+ ui->sharedCB->setEnabled(m_globalShared);
}
void PrinterDescription::setAcceptingJobs(bool accepting)
{
+ ui->rejectPrintJobsCB->setEnabled(true);
ui->rejectPrintJobsCB->setChecked(!accepting);
}
@@ -243,35 +233,35 @@
void PrinterDescription::on_actionPrintTestPage_triggered(bool checked)
{
Q_UNUSED(checked)
- // TODO Show a msg box if failed
- QPointer<KCupsRequest> request = new KCupsRequest;
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
request->printTestPage(m_destName, m_isClass);
- request->waitTillFinished();
- if (request) {
- request->deleteLater();
- }
}
void PrinterDescription::on_actionCleanPrintHeads_triggered(bool checked)
{
Q_UNUSED(checked)
- QPointer<KCupsRequest> request = new KCupsRequest;
+
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
request->printCommand(m_destName, "Clean all", i18n("Clean Print Heads"));
- request->waitTillFinished();
- if (request) {
- request->deleteLater();
- }
}
void PrinterDescription::on_actionPrintSelfTestPage_triggered(bool checked)
{
Q_UNUSED(checked)
- QPointer<KCupsRequest> request = new KCupsRequest;
+
+ KCupsRequest *request = new KCupsRequest;
+ connect(request, SIGNAL(finished()), this, SLOT(requestFinished()));
request->printCommand(m_destName, "PrintSelfTestPage", i18n("Print
Self-Test Page"));
- request->waitTillFinished();
- if (request) {
- request->deleteLater();
+}
+
+void PrinterDescription::requestFinished()
+{
+ KCupsRequest *request = qobject_cast<KCupsRequest*>(sender());
+ if (request && request->hasError()) {
+ emit updateNeeded();
}
}
@@ -282,13 +272,8 @@
void PrinterDescription::enableShareCheckBox(bool enable)
{
- ui->sharedCB->setEnabled(enable);
- if (enable) {
- // Get the current printer share state
- ui->sharedCB->setChecked(m_isShared);
- } else {
- ui->sharedCB->setChecked(false);
- }
+ m_globalShared = enable;
+ setIsShared(m_isShared);
}
void PrinterDescription::on_configurePB_clicked()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.3/printer-manager-kcm/PrinterDescription.h
new/print-manager-4.10.4/printer-manager-kcm/PrinterDescription.h
--- old/print-manager-4.10.3/printer-manager-kcm/PrinterDescription.h
2013-05-03 06:43:16.000000000 +0200
+++ new/print-manager-4.10.4/printer-manager-kcm/PrinterDescription.h
2013-05-28 21:30:34.000000000 +0200
@@ -56,6 +56,9 @@
public slots:
void enableShareCheckBox(bool enable);
+signals:
+ void updateNeeded();
+
private slots:
void on_configurePB_clicked();
void on_openQueuePB_clicked();
@@ -67,11 +70,14 @@
void on_actionCleanPrintHeads_triggered(bool checked);
void on_actionPrintSelfTestPage_triggered(bool checked);
+ void requestFinished();
+
private:
Ui::PrinterDescription *ui;
QString m_destName;
bool m_isClass;
bool m_isShared;
+ bool m_globalShared;
QStringList m_commands;
QPixmap m_printerIcon;
QPixmap m_pauseIcon;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
