X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/672b0fa44cd420dbf5b4d1f9c9a5c3201ada06da..7f65493b92e7e5a10c49cb4de595f6449382ffc8:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index be9d9a53..b8554d58 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -172,11 +172,11 @@ int main(int argc, char **argv)
 		eTextPara::forceReplacementGlyph(i);
 
 	eWidgetDesktop dsk(eSize(720, 576));
-	eWidgetDesktop dsk_lcd(eSize(132, 64));
-	
+	eWidgetDesktop dsk_lcd(my_lcd_dc->size());
+
 	dsk.setStyleID(0);
-	dsk_lcd.setStyleID(1);
-	
+	dsk_lcd.setStyleID(my_lcd_dc->size().width() == 96 ? 2 : 1);
+
 /*	if (double_buffer)
 	{
 		eDebug(" - double buffering found, enable buffered graphics mode.");
@@ -309,14 +309,21 @@ void quitMainloop(int exitCode)
 
 const char *getEnigmaVersionString()
 {
-	return 
-#ifdef ENIGMA2_CHECKOUT_TAG
-		ENIGMA2_CHECKOUT_TAG
+	std::string date =
+#ifdef ENIGMA2_LAST_CHANGE_DATE
+		ENIGMA2_LAST_CHANGE_DATE;
 #else
-		"HEAD"
+		__DATE__;
 #endif
-			"-" __DATE__;
+	std::string branch =
+#ifdef ENIGMA2_BRANCH
+		ENIGMA2_BRANCH;
+#else
+		"HEAD";
+#endif
+	return std::string(date + '-' + branch).c_str();
 }
+
 #include <malloc.h>
 
 void dump_malloc_stats(void)