Merge remote-tracking branch 'origin/KDE/4.13'

core/utils.cpp

@@ -76,13 +76,21 @@ double Utils::dpiY()
 double Utils::realDpiX()
 {
     const QDesktopWidget* w = QApplication::desktop();
-    return (double(w->width()) * 25.4) / double(w->widthMM());
+    if (w->width() > 0 && w->widthMM() > 0) {
+        return (double(w->width()) * 25.4) / double(w->widthMM());
+    } else {
+        return dpiX();
+    }
 }
 
 double Utils::realDpiY()
 {
     const QDesktopWidget* w = QApplication::desktop();
-    return (double(w->height()) * 25.4) / double(w->heightMM());
+    if (w->height() > 0 && w->heightMM() > 0) {
+        return (double(w->height()) * 25.4) / double(w->heightMM());
+    } else {
+        return dpiY();
+    }
 }
 
 QSizeF Utils::realDpi(QWidget* widgetOnScreen)
@@ -121,18 +129,18 @@ QSizeF Utils::realDpi(QWidget* widgetOnScreen)
             QRect outputRect(selectedOutput->pos(),selectedOutput->currentMode()->size());
             QSize szMM = selectedOutput->sizeMm();
             kDebug() << "Output size is " << szMM;
-            QSizeF res(static_cast<qreal>(outputRect.width())*25.4/szMM.width(),
-                    static_cast<qreal>(outputRect.height())*25.4/szMM.height());
-            kDebug() << "Output DPI is " << res;
-            return res;
+            if (szMM.width() > 0 && szMM.height() > 0 && outputRect.width() > 0 && outputRect.height() > 0) {
+                QSizeF res(static_cast<qreal>(outputRect.width())*25.4/szMM.width(),
+                           static_cast<qreal>(outputRect.height())*25.4/szMM.height());
+                kDebug() << "Output DPI is " << res;
+                return res;
+            }
         }
 #endif
     }
     // this is also fallback for LibKScreen branch if KScreen::Output
     // for particular widget was not found
-    const QDesktopWidget* desktop = QApplication::desktop();
-    return QSizeF((desktop->width() * 25.4) / desktop->widthMM(),
-            (desktop->height() * 25.4) / desktop->heightMM());
+    return QSizeF(realDpiX(), realDpiY());
 }
 
 #elif defined(Q_WS_MAC)

generators/epub/libokularGenerator_epub.desktop

@@ -15,7 +15,7 @@ Name[en_GB]=EPub document
 Name[es]=Documento EPub
 Name[et]=EPubi dokument
 Name[eu]=EPub dokumentua
-Name[fi]=EPub-asiakirja
+Name[fi]=EPub-tiedosto
 Name[fr]=Document « EPub »
 Name[ga]=Cáipéis EPub
 Name[gl]=Documento EPub

generators/fax/libokularGenerator_fax.desktop

@@ -15,7 +15,7 @@ Name[en_GB]=Fax documents
 Name[es]=Documentos de fax
 Name[et]=Faksidokumendid
 Name[eu]=Fax-dokumentuak
-Name[fi]=Faksiasiakirja
+Name[fi]=Faksitiedosto
 Name[fr]=Documents pour fax
 Name[ga]=Facsáil cáipéisí
 Name[gl]=Documentos de fax

generators/fictionbook/libokularGenerator_fb.desktop

@@ -16,7 +16,7 @@ Name[eo]=FictionBook dokumento
 Name[es]=Documento FictionBook
 Name[et]=FictionBooki dokument
 Name[eu]=Fikzio-liburu dokumentua
-Name[fi]=FictionBook-asiakirja
+Name[fi]=FictionBook-tiedosto
 Name[fr]=Document « FictionBook »
 Name[ga]=Cáipéis FictionBook
 Name[gl]=Documento FictionBook

generators/mobipocket/libokularGenerator_mobi.desktop

@@ -15,7 +15,7 @@ Name[en_GB]=Mobipocket document
 Name[es]=Documento Mobipocket
 Name[et]=Mobipocketi dokument
 Name[eu]=Mobipocket dokumentua
-Name[fi]=Mobipocket-asiakirja
+Name[fi]=Mobipocket-tiedosto
 Name[fr]=Document « Mobipocket »
 Name[ga]=Cáipéis Mobipocket
 Name[gl]=Documento mobipocket

generators/plucker/libokularGenerator_plucker.desktop

@@ -16,7 +16,7 @@ Name[eo]=Plucker dokumento
 Name[es]=Documento Plucker
 Name[et]=Pluckeri dokument
 Name[eu]=Plucker dokumentua
-Name[fi]=Plucker-asiakirja
+Name[fi]=Plucker-tiedosto
 Name[fr]=Document « Plucker »
 Name[ga]=Cáipéis Plucker
 Name[gl]=Documento Plucker