X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/875b117b3aeca1af73942d4eeb691496f6c884f9..3c4d2076b502a00d66b39f7f390cbed287193ceb:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 7f3ba44b..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.");
@@ -245,6 +245,9 @@ int main(int argc, char **argv)
 //	python.execute("mytest", "__main__");
 	python.execFile("/usr/lib/enigma2/python/mytest.py");
 
+	extern void setFullsize(); // definend in lib/gui/evideo.cpp
+	setFullsize();
+
 	if (exit_code == 5) /* python crash */
 	{
 		eDebug("(exit code 5)");
@@ -306,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
+		__DATE__;
+#endif
+	std::string branch =
+#ifdef ENIGMA2_BRANCH
+		ENIGMA2_BRANCH;
 #else
-		"HEAD"
+		"HEAD";
 #endif
-			"-" __DATE__;
+	return std::string(date + '-' + branch).c_str();
 }
+
 #include <malloc.h>
 
 void dump_malloc_stats(void)