Added translation update

po/de.po

@@ -251,9 +251,9 @@ msgstr ""
 
 #: ..//ui/settings.glade.h:65
 msgid ""
-"<i>Put a rouler on your screen to callibrate the zoom level to fit your "
-"screen\n"
-"The units are cm for the rouler, dpi for the slider</i>"
+"<i>Put a ruler on your screen to calibrate the zoom level to fit your "
+"screen. Takes effect after restarting xournalpp.\n"
+"The units are cm for the ruler, dpi for the slider.</i>"
 msgstr ""
 "<i>Legen Sie einen Massstab auf den Bildschirm um die\n"
 "Bildschirm DPI zu kallibrieren</i>"

po/xournalpp.pot

@@ -208,9 +208,9 @@ msgstr ""
 
 #: ..//ui/settings.glade.h:65
 msgid ""
-"<i>Put a rouler on your screen to callibrate the zoom level to fit your "
-"screen\n"
-"The units are cm for the rouler, dpi for the slider</i>"
+"<i>Put a ruler on your screen to calibrate the zoom level to fit your "
+"screen. Takes effect after restarting xournalpp.\n"
+"The units are cm for the ruler, dpi for the slider.</i>"
 msgstr ""
 
 #: ..//ui/settings.glade.h:67

src/pdf/popplerdirect/poppler/XojPopplerPage.cpp

@@ -4,6 +4,7 @@
 #include <poppler/Gfx.h>
 #include <poppler/OutputDev.h>
 #include "../workaround/workaround.h"
+#include "../../../control/settings/Settings.h"
 
 XojPopplerPage::XojPopplerPage(PDFDoc* doc, GMutex* docMutex,
                                CairoOutputDev* outputDev, Page* page, int index)
@@ -19,6 +20,17 @@ XojPopplerPage::XojPopplerPage(PDFDoc* doc, GMutex* docMutex,
 
 	this->renderMutex = g_mutex_new();
 	this->docMutex = docMutex;
+
+	/*
+	//Set up DPI
+	String settingsname = String::format("%s%c%s%c%s", g_get_home_dir(), G_DIR_SEPARATOR,
+					CONFIG_DIR, G_DIR_SEPARATOR,
+					SETTINGS_XML_FILE);
+	Settings* mysettings =  new Settings(settingsname);
+	mysettings->load();
+	this->pdfDpi = (double) mysettings->getDisplayDpi();
+	*/
+
 }
 
 XojPopplerPage::~XojPopplerPage()
@@ -103,6 +115,7 @@ void XojPopplerPage::render(cairo_t* cr, bool forPrinting)
 	g_mutex_lock(this->docMutex);
 
 	this->page->displaySlice(this->outputDev, 72.0, 72.0, 0,
+	//this->page->displaySlice(this->outputDev, this->pdfDpi, this->pdfDpi, 0,
 	                         false, /* useMediaBox */
 	                         true, /* Crop */
 	                         -1, -1, -1, -1, forPrinting, this->doc->getCatalog(), NULL, NULL,
@@ -128,6 +141,7 @@ void XojPopplerPage::initTextPage()
 		g_mutex_lock(this->docMutex);
 		TextOutputDev* textDev = new TextOutputDev(NULL, true, false, false);
 		Gfx* gfx = this->page->createGfx(textDev, 72.0, 72.0, 0,
+		//Gfx* gfx = this->page->createGfx(textDev, this->pdfDpi, this->pdfDpi, 0,
 		                                 false, /* useMediaBox */
 		                                 true, /* Crop */
 		                                 -1, -1, -1, -1, false, /* printing */

ui/settings.glade

@@ -921,8 +921,8 @@ Xournal file with the same name it will open it&lt;/i&gt;</property>
                   <widget class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">&lt;i&gt;Put a ruler on your screen to calibrate the zoom level to fit your screen.
-The units are cm for the rouler, dpi for the slider&lt;/i&gt;</property>
+                    <property name="label" translatable="yes">&lt;i&gt;Put a ruler on your screen to calibrate the zoom level to fit your screen. Takes effect after restarting xournalpp.
+The units are cm for the ruler, dpi for the slider.&lt;/i&gt;</property>
                     <property name="use_markup">True</property>
                     <property name="justify">center</property>
                     <property name="wrap">True</property>