Attachment #274285 for bug #269310

View | Details | Raw Unified | Return to bug 269310
Collapse All | Expand All




   connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayClicked(QSystemTrayIcon::ActivationReason)));
   qDebug()<<"Current groupe"<<currentGroup;
   qDebug()<<"Avaliblegroupe"<<groupeName;
       
   trayIcon->setToolTip(groupeName[currentGroup]);
   qDebug()<<"xkbConf->layouts[currentGroup].layout"<<xkbConf->layouts[currentGroup].layout;
   
   qDebug()<<map_path + xkbConf->layouts[currentGroup].layout+".png";

   qDebug()<<xkbConf->showFlag;
     if (xkbConf->showFlag && QFile::exists( map_path +"/"+ xkbConf->layouts[currentGroup].layout+".png"))
     {
          trayIcon-> setIcon(QIcon(map_path+"/"+xkbConf->layouts[currentGroup].layout+".png"));

     }
     else
     {
        QString layout=xkbConf->layouts[currentGroup].layout;
        QFont font("Helvetica [Cronyx]",15);
        font.setBold(true);
        font.setLetterSpacing(QFont::PercentageSpacing,120);

Lines 56-64 Link Here

(-)axkb-0.4.2/src/keyswitch.cpp (-2 / +2 lines)
56	return;	56	return;
57	}	57	}
58	setToolTip(groupeName[currentGroup]);	58	setToolTip(groupeName[currentGroup]);
59	if (xkbConf->showFlag && QFile::exists(map_path + rule->layouts.key(groupeName[currentGroup])+".png"))	59	if (xkbConf->showFlag && QFile::exists(map_path + xkbConf->layouts[currentGroup].layout+".png"))
60	{	60	{
61	setPixmap(QPixmap(map_path + rule->layouts.key(groupeName[currentGroup])+".png"));	61	setPixmap(QPixmap(map_path + xkbConf->layouts[currentGroup].layout+".png"));
62		62
63	}	63	}
64	else	64	else

Return to bug 269310

Lines 299-316 Link Here

(-)axkb-0.4.2/src/axkb.cpp (-4 / +7 lines)
299	connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayClicked(QSystemTrayIcon::ActivationReason)));	299	connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayClicked(QSystemTrayIcon::ActivationReason)));
300	qDebug()<<"Current groupe"<<currentGroup;	300	qDebug()<<"Current groupe"<<currentGroup;
301	qDebug()<<"Avaliblegroupe"<<groupeName;	301	qDebug()<<"Avaliblegroupe"<<groupeName;
		302
302	trayIcon->setToolTip(groupeName[currentGroup]);	303	trayIcon->setToolTip(groupeName[currentGroup]);
303	qDebug()<<map_path + rule->layouts.key(groupeName[currentGroup])+".png";	304	qDebug()<<"xkbConf->layouts[currentGroup].layout"<<xkbConf->layouts[currentGroup].layout;
		305
		306	qDebug()<<map_path + xkbConf->layouts[currentGroup].layout+".png";
304		307
305	qDebug()<<xkbConf->showFlag;	308	qDebug()<<xkbConf->showFlag;
306	if (xkbConf->showFlag && QFile::exists( map_path +"/"+ rule->layouts.key(groupeName[currentGroup])+".png"))	309	if (xkbConf->showFlag && QFile::exists( map_path +"/"+ xkbConf->layouts[currentGroup].layout+".png"))
307	{	310	{
308	trayIcon-> setIcon(QIcon(map_path+"/"+rule->layouts.key(groupeName[currentGroup])+".png"));	311	trayIcon-> setIcon(QIcon(map_path+"/"+xkbConf->layouts[currentGroup].layout+".png"));
309		312
310	}	313	}
311	else	314	else
312	{	315	{
313	QString layout=rule->layouts.key(groupeName[currentGroup]);	316	QString layout=xkbConf->layouts[currentGroup].layout;
314	QFont font("Helvetica [Cronyx]",15);	317	QFont font("Helvetica [Cronyx]",15);
315	font.setBold(true);	318	font.setBold(true);
316	font.setLetterSpacing(QFont::PercentageSpacing,120);	319	font.setLetterSpacing(QFont::PercentageSpacing,120);