diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-03-05 22:17:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-03-05 22:41:23 +0900 |
| commit | 9cff750d6cdda3d0fc24671b2c98d12102915505 (patch) | |
| tree | 3515bd2b5a20346294fcedb731c25e1bc7cb0fda | |
| parent | ea10b6290dd14c79fd3192a2f772093310b94f22 (diff) | |
| download | tdelibs-9cff750d.tar.gz tdelibs-9cff750d.zip | |
tdeprint: make KPrinter::setOrientation and KPrinter::setPageSize non locking by default and add ability to specify their locking behavior.
This is a backward compatible API change and a non compatible ABI change.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | tdeprint/kprinter.cpp | 14 | ||||
| -rw-r--r-- | tdeprint/kprinter.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 010297e5a..740bac293 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -597,12 +597,15 @@ int KPrinter::metric(int m) const return val; } -void KPrinter::setOrientation(Orientation o) +void KPrinter::setOrientation(Orientation o, bool locking) { KMFactory::self()->settings()->orientation = o; setOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); d->m_impl->broadcastOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); - d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + } } void KPrinter::setOption( const TQString& key, const TQString& value, bool broadcast ) @@ -612,11 +615,14 @@ void KPrinter::setOption( const TQString& key, const TQString& value, bool broad d->m_impl->broadcastOption( key, value ); } -void KPrinter::setPageSize(PageSize s) +void KPrinter::setPageSize(PageSize s, bool locking) { KMFactory::self()->settings()->pageSize = s; setOption("kde-pagesize",TQString::number((int)s),true); - d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + } } void KPrinter::setOptions(const TQMap<TQString,TQString>& opts) diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h index 0ac329604..6a0cde6d0 100644 --- a/tdeprint/kprinter.h +++ b/tdeprint/kprinter.h @@ -289,7 +289,7 @@ public: /** * See TQPrinter::setOrientation(). */ - void setOrientation(Orientation); + void setOrientation(Orientation, bool locking = false); /** * See TQPrinter::pageOrder(). */ @@ -347,7 +347,7 @@ public: /** * See TQPrinter::setPageSize(). */ - void setPageSize(PageSize); + void setPageSize(PageSize, bool locking = false); /** * See TQPrinter::printerName(). */ |