Changeset 575 for trunk/src

Timestamp:

Feb 18, 2010, 12:24:18 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Non-native QPrinterDialog: Leave the output file name empty when a real printer is selected as it is confusing and disable the file browser button to match the state of the disabled entry field. Enable default output file name generation on OS/2.

File:

• trunk/src/gui/dialogs/qprintdialog_unix.cpp (modified) (7 diffs)

trunk/src/gui/dialogs/qprintdialog_unix.cpp

@@ -740 +740 @@
         widget.filename->setEnabled(true);
         widget.lOutput->setEnabled(true);
+        widget.fileBrowser->setEnabled(true);
     }
 
@@ -754 +755 @@
     delete cups;
 #endif
+}
+
+static QString defaultOutputFileName(const QString &docName, QPrinter::OutputFormat format)
+{
+    if (format == QPrinter::PostScriptFormat || format == QPrinter::PdfFormat) {
+        QString cur = QDir::currentPath();
+#ifndef Q_WS_PM
+        QString home = QDir::homePath();
+        if (home.at(home.length()-1) != QLatin1Char('/'))
+            home += QLatin1Char('/');
+        if (cur.at(cur.length()-1) != QLatin1Char('/'))
+            cur += QLatin1Char('/');
+        if (cur.left(home.length()) != home)
+            cur = home;
+#endif
+#if defined(Q_WS_X11) || defined(Q_WS_PM)
+        if (docName.isEmpty()) {
+            if (format == QPrinter::PostScriptFormat)
+                cur += QLatin1String("print.ps");
+            else
+                cur += QLatin1String("print.pdf");
+        } else {
+            QRegExp re(QString::fromLatin1("(.*)\\.\\S+"));
+            if (re.exactMatch(docName))
+                cur += re.cap(1);
+            else
+                cur += docName;
+            if (format == QPrinter::PostScriptFormat)
+                cur += QLatin1String(".ps");
+            else
+                cur += QLatin1String(".pdf");
+        }
+#endif
+        return cur;
+    }
+    return QString::null;
 }
 
@@ -763 +800 @@
     widget.filename->setEnabled(false);
     widget.lOutput->setEnabled(false);
+    widget.fileBrowser->setEnabled(false);
 
     if (filePrintersAdded) {
@@ -774 +812 @@
             widget.filename->setEnabled(true);
             QString filename = widget.filename->text();
-            QString suffix = QFileInfo(filename).suffix();
-            if (pdfPrinter && suffix == QLatin1String("ps"))
-                filename = filename.replace(QLatin1String(".ps"), QLatin1String(".pdf"));
-            if (!pdfPrinter && suffix == QLatin1String("pdf"))
-                filename = filename.replace(QLatin1String(".pdf"), QLatin1String(".ps"));
-            widget.filename->setText(filename);
+            if (filename.isEmpty())
+                filename = defaultOutputFileName(printer->docName(), pdfPrinter ? QPrinter::PdfFormat :
+                                                 QPrinter::PostScriptFormat);
+            else {
+                QFileInfo fileInfo = QFileInfo(filename);
+                QString suffix = fileInfo.suffix();
+                if (pdfPrinter && suffix == QLatin1String("ps"))
+                    filename = fileInfo.path() + QDir::separator() +
+                        fileInfo.completeBaseName() + QLatin1String(".pdf");
+                if (!pdfPrinter && suffix == QLatin1String("pdf"))
+                    filename = fileInfo.path() + QDir::separator() +
+                        fileInfo.completeBaseName() + QLatin1String(".ps");
+                filename = QDir::cleanPath(filename);
+            }
+            widget.filename->setText(QDir::toNativeSeparators(filename));
             widget.lOutput->setEnabled(true);
+            widget.fileBrowser->setEnabled(true);
             if (propertiesDialog)
                 propertiesDialog->selectPdfPsPrinter(printer);
@@ -846 +894 @@
 #endif
     if (!filename.isEmpty()) {
-        widget.filename->setText(filename);
+        widget.filename->setText(QDir::toNativeSeparators(filename));
         if (filename.endsWith(QString::fromLatin1(".ps"), Qt::CaseInsensitive))
             widget.printers->setCurrentIndex(widget.printers->count() - 1); // the postscript one
@@ -861 +909 @@
         return;
     printer = p;
-    if (p->outputFileName().isEmpty()) {
-        QString home = QString::fromLocal8Bit(qgetenv("HOME").constData());
-        QString cur = QDir::currentPath();
-        if (home.at(home.length()-1) != QLatin1Char('/'))
-            home += QLatin1Char('/');
-        if (cur.at(cur.length()-1) != QLatin1Char('/'))
-            cur += QLatin1Char('/');
-        if (cur.left(home.length()) != home)
-            cur = home;
-#ifdef Q_WS_X11
-        if (p->docName().isEmpty()) {
-            if (p->outputFormat() == QPrinter::PostScriptFormat)
-                cur += QLatin1String("print.ps");
-            else
-                cur += QLatin1String("print.pdf");
-        } else {
-            QRegExp re(QString::fromLatin1("(.*)\\.\\S+"));
-            if (re.exactMatch(p->docName()))
-                cur += re.cap(1);
-            else
-                cur += p->docName();
-            if (p->outputFormat() == QPrinter::PostScriptFormat)
-                cur += QLatin1String(".ps");
-            else
-                cur += QLatin1String(".pdf");
-        }
-#endif
-        widget.filename->setText(cur);
-    }
+    if (p->outputFileName().isEmpty())
+        widget.filename->setText(QDir::toNativeSeparators(
+            defaultOutputFileName(p->docName(), p->outputFormat())));
     else
-        widget.filename->setText( p->outputFileName() );
-    QString printer = p->printerName();
-    if (!printer.isEmpty()) {
+        widget.filename->setText(QDir::toNativeSeparators(p->outputFileName()));
+    QString printerName = p->printerName();
+    if (!printerName.isEmpty()) {
         for (int i = 0; i < widget.printers->count(); ++i) {
-            if (widget.printers->itemText(i) == printer) {
+            if (widget.printers->itemText(i) == printerName) {
                 widget.printers->setCurrentIndex(i);
                 break;
@@ -979 +1001 @@
         QString path = widget.filename->text();
         if (QDir::isRelativePath(path))
+#ifndef Q_WS_PM
             path = QDir::homePath() + QDir::separator() + path;
+#else
+            path = QDir::currentPath() + QDir::separator() + path;
+#endif
         printer->setOutputFileName(path);
     }