update sv language

[enigma2.git] / main / enigma.cpp

diff --git a/main/enigma.cpp b/main/enigma.cpp
index 5a22110e4e15280050d223d51284559707fae6ea..eb0a1845f472165eec9762edb5ae9d9d75167047 100644 (file)
--- a/main/enigma.cpp
+++ b/main/enigma.cpp
@@ -63,10 +63,10 @@ void keyEvent(const eRCKey &key)
        if (key.flags & eRCKey::flagAscii)
        {
                prev_ascii_code = key.code;
-               ptr->keyPressed(0, 510 /* faked KEY_ASCII */, 0);
+               ptr->keyPressed(key.producer->getIdentifier(), 510 /* faked KEY_ASCII */, 0);
        }
        else
-               ptr->keyPressed(0, key.code, key.flags);
+               ptr->keyPressed(key.producer->getIdentifier(), key.code, key.flags);
 }
 
 /************************************************/
@@ -155,11 +155,13 @@ int main(int argc, char **argv)
        eTextPara::forceReplacementGlyph(0xfdf2);
        for (int i = 0xfe80; i < 0xff00; ++i)
                eTextPara::forceReplacementGlyph(i);
-       
 
        eWidgetDesktop dsk(eSize(720, 576));
        eWidgetDesktop dsk_lcd(eSize(132, 64));
        
+       dsk.setStyleID(0);
+       dsk_lcd.setStyleID(1);
+       
 /*     if (double_buffer)
        {
                eDebug(" - double buffering found, enable buffered graphics mode.");
@@ -186,6 +188,27 @@ int main(int argc, char **argv)
                /* redrawing is done in an idle-timer, so we have to set the context */
        dsk.setRedrawTask(main);
        dsk_lcd.setRedrawTask(main);
+       
+       
+       eDebug("Loading spinners...");
+       
+       {
+               int i;
+               ePtr<gPixmap> wait[4];
+               for (i=0; i<4; ++i)
+               {
+                       char filename[strlen(DATADIR) + 20];
+                       sprintf(filename, DATADIR "/enigma2/wait%d.png", i + 1);
+                       if (loadPNG(wait[i], filename))
+                       {
+                               eDebug("failed to load %s! (%m)", filename);
+                               continue;
+                       }
+               }
+               my_dc->setSpinner(eRect(100, 100, 105, 105), wait, 4);
+       }
+       
+       gRC::getInstance()->setSpinnerDC(my_dc);
 
        eRCInput::getInstance()->keyEvent.connect(slot(keyEvent));
        
@@ -233,10 +256,3 @@ void quitMainloop(int exitCode)
        exit_code = exitCode;
        eApp->quit(0);
 }
-
-void addFont(const char *filename, const char *alias, int scale_factor, int is_replacement)
-{
-       fontRenderClass::getInstance()->AddFont(filename, alias, scale_factor);
-       if (is_replacement)
-               eTextPara::setReplacementFont(alias);
-}