X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=main%2Fenigma.cpp;h=b8554d582c1b72f6788002509a36ae3c6a4f698d;hp=98175c49425f927a358a41f8d1471f04b96ab328;hb=97b86324d322309843cc5d9d93b039d706c5ae58;hpb=d924772eeced2429c007e51ce6dcb50dadec2836

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 98175c4..b8554d5 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.");
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
 		ePtr<gPixmap> wait[MAX_SPINNER];
 		for (i=0; i<MAX_SPINNER; ++i)
 		{
-			char filename[strlen(DATADIR) + 20];
+			char filename[strlen(DATADIR) + 41];
 			sprintf(filename, DATADIR "/enigma2/skin_default/spinner/wait%d.png", i + 1);
 			loadPNG(wait[i], filename);
 			
@@ -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)