--- infoscreen/MainView.cpp 2010/06/20 22:10:29 866 +++ infoscreen/MainView.cpp 2010/06/21 12:23:07 867 @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -59,11 +60,15 @@ video = new VideoView(this); video->setVisible(false); + svg = new QSvgWidget(this); + svg->setVisible(false); + QVBoxLayout* layout = new QVBoxLayout(); layout->addWidget(web,1); layout->addWidget(render,1); layout->addWidget(picture,1); layout->addWidget(video,1); + layout->addWidget(svg,1); layout->addStretch(); layout->setContentsMargins(0,0,0,0); setLayout(layout); @@ -171,6 +176,11 @@ item.runtime = 10; } + if (ext == "svg") { + item.module = ModuleSvg; + item.runtime = 10; + } + if (item.module != ModuleUnknown) { //no need to enqueue unknown modules screenItems.push_back( item ); } @@ -234,20 +244,26 @@ } if (found) { - - if (currentItem.module == ModuleImage) { + switch(currentItem.module) { + case ModuleImage: ensureVisible(picture); - picture->loadFromUrl( currentItem.url ); - - } else if (currentItem.module == ModuleWeb) { + break; + case ModuleWeb: ensureVisible(web); web->load(currentItem.url); - } else if (currentItem.module == ModuleVideo) { + break; + case ModuleVideo: ensureVisible(video); video->loadUrl(currentItem.url); - } else { + break; + case ModuleSvg: + ensureVisible(svg); + svg->load(currentItem.url); + break; + default: // ModuleUnknown - what should we do?? + break; } } else { @@ -282,4 +298,5 @@ web->setVisible( false); picture->setVisible( false ); video->setVisible(false); + svg->setVisible(false); }