X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/479df2313449286767814bc0c89624fdd45d2a2d..35b4469fbb9f5bf80bba60c29916057aaa3c5bd0:/main/enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 9c2a5ed6..65ba4050 100644
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -128,15 +128,11 @@ public:
 		m_locale_time_handler = new eDVBLocalTimeHandler();
 		m_epgcache = new eEPGCache();
 		m_mgr->setChannelList(m_dvbdb);
-		
-//		m_scan = new eComponentScan();
-//		m_scan->start();
-
 	}
 	
 	~eMain()
 	{
-		m_dvbdb->save();
+		m_dvbdb->saveServicelist();
 		m_scan = 0;
 	}
 };
@@ -177,7 +173,17 @@ int main(int argc, char **argv)
 	ePtr<gLCDDC> my_lcd_dc;
 	gLCDDC::getInstance(my_lcd_dc);
 
-	fontRenderClass::getInstance()->AddFont(FONTDIR "/arial.ttf", "Arial", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/md_khmurabi_10.ttf", "Regular", 100);
+	fontRenderClass::getInstance()->AddFont(FONTDIR "/ae_AlMateen.ttf", "Replacement", 90);
+	eTextPara::setReplacementFont("Replacement");
+	
+			/* some characters are wrong in the regular font, force them to use the replacement font */
+	for (int i = 0x60c; i <= 0x66d; ++i)
+		eTextPara::forceReplacementGlyph(i);
+	eTextPara::forceReplacementGlyph(0xfdf2);
+	for (int i = 0xfe80; i < 0xff00; ++i)
+		eTextPara::forceReplacementGlyph(i);
+	
 
 	eWidgetDesktop dsk(eSize(720, 576));
 	eWidgetDesktop dsk_lcd(eSize(132, 64));
@@ -217,16 +223,17 @@ int main(int argc, char **argv)
 	lcd_win->resize(eSize(132, 64));
 	
 	lcd_label = new eLabel(lcd_win);
-	lcd_label->move(ePoint(0, 10));
-	lcd_label->resize(eSize(132, 36));
-	ePtr<gFont> font = new gFont("Arial", 16);
+	lcd_label->move(ePoint(0, 4));
+	lcd_label->resize(eSize(132, 42));
+	ePtr<gFont> font = new gFont("Regular", 19);
+	//ePtr<gFont> font = new gFont("Regular", 16);
 	lcd_label->setFont(font);
 
 	lcd_clock = new eLabel(lcd_win);
 	lcd_clock->move(ePoint(50, 46));
-	lcd_clock->resize(eSize(132, 20));
-	//ePtr<gFont> clkfont = new gFont("Arial", 18);
-	lcd_clock->setFont(font);
+	lcd_clock->resize(eSize(132, 18));
+	ePtr<gFont> clkfont = new gFont("Regular", 16);
+	lcd_clock->setFont(clkfont);
 
 	//lcd_label->setText("bla bla bla, this lcd\nSUCKS!");
 	//lcd_clock->setText("88:88:88");
@@ -239,8 +246,6 @@ int main(int argc, char **argv)
 
 	python.execute("mytest", "__main__");
 
-//	eApp->exec();
-
 	return exit_code;
 }
 
@@ -249,9 +254,14 @@ eWidgetDesktop *getDesktop()
 	return wdsk;
 }
 
+eApplication *getApplication()
+{
+	return eApp;
+}
+
 void runMainloop()
 {
-	exit_code = eApp->exec();
+	exit_code = eApp->runLoop();
 }
 
 void quitMainloop(int exitCode)