Hello community,
here is the log from the commit of package kde4-print-manager for
openSUSE:Factory checked in at 2013-05-16 16:47:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-04-18 10:19:20.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kde4-print-manager.new/kde4-print-manager.changes
2013-05-16 16:48:42.000000000 +0200
@@ -1,0 +2,8 @@
+Sat May 4 17:29:20 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.3
+ * Bugfix release
+ * See http://www.kde.org/announcements/announce-4.10.3.php
+ * resolves bnc#818500
+
+-------------------------------------------------------------------
Old:
----
print-manager-4.10.2.tar.xz
New:
----
print-manager-4.10.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kde4-print-manager.spec ++++++
--- /var/tmp/diff_new_pack.SYhKpc/_old 2013-05-16 16:48:43.000000000 +0200
+++ /var/tmp/diff_new_pack.SYhKpc/_new 2013-05-16 16:48:43.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.2
+Version: 4.10.3
Release: 0
Source: print-manager-%{version}.tar.xz
Obsoletes: kde4-printer-applet < 4.9.80
++++++ print-manager-4.10.2.tar.xz -> print-manager-4.10.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.2/add-printer/AddPrinterAssistant.cpp
new/print-manager-4.10.3/add-printer/AddPrinterAssistant.cpp
--- old/print-manager-4.10.2/add-printer/AddPrinterAssistant.cpp
2013-03-01 08:06:22.000000000 +0100
+++ new/print-manager-4.10.3/add-printer/AddPrinterAssistant.cpp
2013-05-03 06:43:18.000000000 +0200
@@ -229,8 +229,11 @@
// Finish Button
if (button == KDialog::User1) {
GenericPage *page =
qobject_cast<GenericPage*>(currentPage()->widget());
+ enableFinishButton(false);
if (page->finishClicked()) {
KAssistantDialog::slotButtonClicked(button);
+ } else {
+ enableFinishButton(true);
}
} else {
KAssistantDialog::slotButtonClicked(button);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.2/add-printer/PageAddPrinter.cpp
new/print-manager-4.10.3/add-printer/PageAddPrinter.cpp
--- old/print-manager-4.10.2/add-printer/PageAddPrinter.cpp 2013-03-29
08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/add-printer/PageAddPrinter.cpp 2013-05-03
06:43:18.000000000 +0200
@@ -150,6 +150,15 @@
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;
}
@@ -170,6 +179,30 @@
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.2/add-printer/PageAddPrinter.h
new/print-manager-4.10.3/add-printer/PageAddPrinter.h
--- old/print-manager-4.10.2/add-printer/PageAddPrinter.h 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.3/add-printer/PageAddPrinter.h 2013-05-03
06:43:18.000000000 +0200
@@ -48,6 +48,9 @@
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.2/libkcups/ClassListWidget.cpp
new/print-manager-4.10.3/libkcups/ClassListWidget.cpp
--- old/print-manager-4.10.2/libkcups/ClassListWidget.cpp 2013-03-01
08:06:22.000000000 +0100
+++ new/print-manager-4.10.3/libkcups/ClassListWidget.cpp 2013-05-03
06:43:18.000000000 +0200
@@ -66,10 +66,10 @@
att << KCUPS_PRINTER_URI_SUPPORTED;
// Get destinations with these masks
m_request = new KCupsRequest;
- m_request->getPrinters(att,
- CUPS_PRINTER_CLASS | CUPS_PRINTER_REMOTE |
CUPS_PRINTER_IMPLICIT);
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.2/plasmoid-package/metadata.desktop
new/print-manager-4.10.3/plasmoid-package/metadata.desktop
--- old/print-manager-4.10.2/plasmoid-package/metadata.desktop 2013-03-29
08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/plasmoid-package/metadata.desktop 2013-05-03
06:43:16.000000000 +0200
@@ -18,6 +18,7 @@
Name[kk]=Басып шығаруды басқару
Name[km]=គ្រប់គ្រងការងារបោះពុម្ព
Name[ko]=인쇄 작업 관리
+Name[lt]=Tvarkyti spausdinimo užduotis
Name[mr]=छपाई कार्ये व्यवस्थापन करा
Name[nb]=Håndter utskriftsjobber
Name[nl]=Afdruktaken beheren
@@ -57,6 +58,7 @@
Comment[kk]=Басу тапсырмалар кезегі мен оны басқару
Comment[km]=រាយការងារបោះពុម្ព និងគ្រប់គ្រងពួកវា
Comment[ko]=인쇄 작업을 보여 주고 관리하기
+Comment[lt]=Rikiuoti spausdinimo užduotis ir jas tvarkyti
Comment[mr]=छपाई कार्यांची यादी व व्यवस्थापन करतो
Comment[nb]=List utskriftsjobber og håndter dem
Comment[nl]=Toon afdruktaken en beheer ze
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.2/print-manager-kded/printmanager.desktop
new/print-manager-4.10.3/print-manager-kded/printmanager.desktop
--- old/print-manager-4.10.2/print-manager-kded/printmanager.desktop
2013-03-29 08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/print-manager-kded/printmanager.desktop
2013-05-03 06:43:16.000000000 +0200
@@ -25,6 +25,7 @@
Name[kk]=Басып шығару менеджері
Name[km]=កម្មវិធីគ្រប់គ្រងការបោះពុម្ព
Name[ko]=인쇄 관리자
+Name[lt]=Spausdinimo tvarkyklė
Name[mr]=छपाई व्यवस्थापक
Name[nb]=Utskriftsbehandler
Name[nl]=Afdrukbeheer
@@ -64,6 +65,7 @@
Comment[kk]=Жаңа принтер байқалғанын және басу мәселелер туралы хабарлау
Comment[km]=ប្រាប់នៅពេលរកឃើញម៉ាស៊ីនបោះពុម្ពថ្មី
និងបញ្ហាក្នុងការបោះពុម្ព
Comment[ko]=새 프린터가 감지되거나 문제가 생겼을 때 알림
+Comment[lt]=Informuoti kai aptiktas naujas spausdintuvas ir esant spausdinimo
problemoms
Comment[mr]=नवीन छपाईयंत्र सापडल्यास व छपाई समस्या झाल्यास सूचना द्या
Comment[nb]=Si fra når det oppdages en ny skriver, og skriv ut problemer
Comment[nl]=Toon wanneer een nieuwe printer is ontdekt en toon problemen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.2/print-manager-kded/printmanager.notifyrc
new/print-manager-4.10.3/print-manager-kded/printmanager.notifyrc
--- old/print-manager-4.10.2/print-manager-kded/printmanager.notifyrc
2013-03-29 08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/print-manager-kded/printmanager.notifyrc
2013-05-03 06:43:16.000000000 +0200
@@ -19,6 +19,7 @@
Name[kk]=басуды басқару
Name[km]=កម្មវិធីគ្រប់គ្រងការបោះពុម្ព
Name[ko]=printmanager
+Name[lt]=printmanager
Name[mr]=छपाई व्यवस्थापक
Name[nb]=utskriftsbehandler
Name[nl]=afdrukbeheerder
@@ -58,6 +59,7 @@
Comment[kk]=Жаңа принтер байқалғанын хабарлау
Comment[km]=ជូនដំណឹងនៅពេលរកឃើញម៉ាស៊ីនបោះពុម្ពថ្មី
Comment[ko]=새 프린터가 감지되었을 때 알림
+Comment[lt]=Informuoja kai aptinkamas naujas spausdintuvas
Comment[mr]=नवीन छपाईयंत्र सापडल्यास सूचना देतो
Comment[nb]=Varsler når en ny skriver oppdages
Comment[nl]=Toont wanneer een nieuwe printer is ontdekt
@@ -98,6 +100,7 @@
Name[kk]=Жаңа принтер байқалды
Name[km]=រកឃើញម៉ាស៊ីនបោះពុម្ពថ្មី
Name[ko]=새 프린터가 감지됨
+Name[lt]=Aptiktas naujas spausdintuvas
Name[mr]=नवीन छपाईयंत्र सापडले
Name[nb]=En ny skriver ble funnet
Name[nl]=Er is een nieuwe printer ontdekt
@@ -140,6 +143,7 @@
Name[kk]=Жаңа принтер қосылды
Name[km]=រកឃើញម៉ាស៊ីនបោះពុម្ពថ្មី
Name[ko]=새 프린터가 추가됨
+Name[lt]=Naujas spausdintuvas buvo pridėtas
Name[mr]=नवीन छपाईयंत्र जोडले
Name[nb]=Den nye skriveren ble lagt til
Name[nl]=De nieuwe printer is toegevoegd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/print-manager-4.10.2/printer-manager-kcm/kcm_printer_manager.desktop
new/print-manager-4.10.3/printer-manager-kcm/kcm_printer_manager.desktop
--- old/print-manager-4.10.2/printer-manager-kcm/kcm_printer_manager.desktop
2013-03-29 08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/printer-manager-kcm/kcm_printer_manager.desktop
2013-05-03 06:43:16.000000000 +0200
@@ -30,6 +30,7 @@
Name[kk]=Принтерлер
Name[km]=ម៉ាស៊ីនបោះពុម្ព
Name[ko]=프린터
+Name[lt]=Spausdintuvai
Name[mai]=मुद्रक
Name[mr]=छपाईयंत्रे
Name[nb]=Skrivere
@@ -66,7 +67,7 @@
Comment[en_GB]=Configure your printers
Comment[es]=Configure sus impresoras
Comment[et]=Printerite seadistamine
-Comment[fi]=Tulostinten asetukset
+Comment[fi]=Tulostinasetukset
Comment[fr]=Configure vos imprimantes
Comment[ga]=Cumraigh printéirí
Comment[gl]=Configure as súas impresoras.
@@ -76,6 +77,7 @@
Comment[kk]=Принтерлерін баптау
Comment[km]=កំណត់រចនាសម្ព័ន្ធម៉ាស៊ីនបោះពុម្ពរបស់អ្នក
Comment[ko]=프린터 설정
+Comment[lt]=Konfigūruoti Jūsų spausdintuvus
Comment[mr]=तुमची छपाईयंत्रे संयोजीत करा
Comment[nb]=Sett opp skrivere
Comment[nl]=Uw printers instellen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/print-manager-4.10.2/printqueue/PrintQueueUi.cpp
new/print-manager-4.10.3/printqueue/PrintQueueUi.cpp
--- old/print-manager-4.10.2/printqueue/PrintQueueUi.cpp 2013-03-29
08:05:57.000000000 +0100
+++ new/print-manager-4.10.3/printqueue/PrintQueueUi.cpp 2013-05-03
06:43:18.000000000 +0200
@@ -32,6 +32,7 @@
#include <QToolBar>
#include <QMenu>
#include <QByteArray>
+#include <QStringBuilder>
#include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage>
@@ -66,7 +67,12 @@
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(printer.icon());
-// setWindowTitle(ui->windowTitle());
+ if (printer.info().isEmpty()) {
+ m_title = printer.name();
+ } else {
+ m_title = printer.name() % QLatin1String(" - ") % printer.info();
+ }
+ setWindowTitle(m_title);
setButtons(0);
setSizeGripEnabled(true);
(void) minimumSizeHint(); //Force the dialog to be laid out now
@@ -75,7 +81,6 @@
m_isClass = printer.isClass();
// setup default options
- setWindowTitle(m_destName.isNull() ? i18n("All printers") : m_destName);
ui->jobsView->setCornerWidget(new QWidget);
setupButtons();
@@ -412,7 +417,11 @@
KCupsPrinter printer = request->printers().first();
// get printer-info
- m_title = printer.info();
+ if (printer.info().isEmpty()) {
+ m_title = printer.name();
+ } else {
+ m_title = printer.name() % QLatin1String(" - ") % printer.info();
+ }
// get printer-state
setState(printer.state(), printer.stateMsg());
@@ -421,19 +430,21 @@
m_isClass = printer.isClass();
request->deleteLater();
+
+ update();
}
void PrintQueueUi::update()
{
// Set window title
if (m_model->rowCount()) {
- if (m_title.isNull()) {
+ if (m_destName.isNull()) {
setWindowTitle(i18np("All Printers (%1 Job)", "All Printers (%1
Jobs)", m_model->rowCount()));
} else {
setWindowTitle(i18np("%2 (%1 Job)", "%2 (%1 Jobs)",
m_model->rowCount(), m_title));
}
} else {
- setWindowTitle(m_title.isNull() ? i18n("All Printers") : m_title);
+ setWindowTitle(m_destName.isNull() ? i18n("All Printers") : m_title);
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
