diff -Naur qxkb-0.4.4-orig/src/qxkb.cpp qxkb-0.4.4/src/qxkb.cpp --- qxkb-0.4.4-orig/src/qxkb.cpp 2011-11-11 14:39:38.000000000 +0200 +++ qxkb-0.4.4/src/qxkb.cpp 2012-12-30 11:13:23.495997552 +0200 @@ -204,32 +204,13 @@ connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayClicked(QSystemTrayIcon::ActivationReason))); trayIcon->setToolTip(groupeName[currentGroup]); QString PNGfile = map_path +"/"+ layout+".png"; - QString SVGfile = map_path +"/"+ layout+".svg"; bool havePNG = QFile::exists(PNGfile ); - bool haveSVG = QFile::exists( SVGfile); - QSvgRenderer flagSVG(SVGfile); - - if (haveSVG) - { - haveSVG = haveSVG && flagSVG.isValid(); - } - - if (xkbConf->showFlag && (havePNG || haveSVG )) - { - if (haveSVG) - { - QPixmap pix(32,22); - QPainter painter; - painter.begin(&pix); - flagSVG.render(&painter,QRectF(0,0,32,22)); - painter.end(); - trayIcon-> setIcon(QIcon(pix)); - } - else if (havePNG) - trayIcon-> setIcon(QIcon(PNGfile)); - - + + if (xkbConf->showFlag && havePNG) + { + trayIcon-> setIcon(QIcon(PNGfile)); + } else { @@ -329,27 +310,8 @@ { QAction *act = new QAction(groupeName[index],this) ; QString PNGfile = map_path + xkbConf->layouts[index].layout+".png"; - QString SVGfile = map_path + xkbConf->layouts[index].layout+".svg"; bool havePNG = QFile::exists(PNGfile ); - bool haveSVG = QFile::exists( SVGfile); - - if (haveSVG) - { - QSvgRenderer flagSVG(SVGfile); - if ( haveSVG && flagSVG.isValid() ) - { - QPixmap pix(32,22); - QPainter painter; - painter.begin(&pix); - flagSVG.render(&painter,QRectF(0,0,32,22)); - painter.end(); - act->setIcon(QIcon(pix)); - } - else - act->setIcon(QIcon(PNGfile)); - } - else if (havePNG) - act->setIcon(QIcon(PNGfile)); + act->setIcon(QIcon(PNGfile)); act->setData(groupeName[index]); contextMenu->addAction(act);