diff options
Diffstat (limited to 'tdeprint/kprinter.cpp')
| -rw-r--r-- | tdeprint/kprinter.cpp | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 010297e5a..c3f74316e 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -34,14 +34,14 @@ #include <tqdir.h> #include <tqguardedptr.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <krun.h> #include <knotifyclient.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klibloader.h> #include <tdemessagebox.h> @@ -101,14 +101,14 @@ public: bool m_restore; bool m_previewonly; WId m_parentId; - QString m_docfilename; + TQString m_docfilename; TQString m_docdirectory; KPrinterWrapper *m_wrapper; TQMap<TQString,TQString> m_options; - QString m_tmpbuffer; - QString m_printername; - QString m_searchname; - QString m_errormsg; + TQString m_tmpbuffer; + TQString m_printername; + TQString m_searchname; + TQString m_errormsg; bool m_ready; int m_pagenumber; DrPageSize *m_pagesize; @@ -218,7 +218,7 @@ void KPrinter::saveSettings() bool KPrinter::setup(TQWidget *parent, const TQString& caption, bool forceExpand) { - if (!kapp->authorize("print/dialog")) + if (!tdeApp->authorize("print/dialog")) { autoConfigure(TQString::null, parent); return true; // Just print it @@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer) args << "-d"; args << printerName(); args << "--noshow"; - kapp->tdeinitExec("kjobviewer", args); + tdeApp->tdeinitExec("kjobviewer", args); } } } @@ -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) |