[patch] fix show flags in tray

tray_flags-0.4.2.patch (text/plain), 2.22 KB, created by Sokolov Artem on 2011-05-22 15:52:44 UTC

diff -Nur axkb-0.4.2/src/axkb.cpp ../axkbMine/axkb-0.4.2/src/axkb.cpp
--- axkb-0.4.2/src/axkb.cpp	2009-05-16 15:15:25.000000000 +0700
+++ ../axkbMine/axkb-0.4.2/src/axkb.cpp	2011-05-23 21:38:36.000000000 +0700
@@ -299,18 +299,21 @@
    connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayClicked(QSystemTrayIcon::ActivationReason)));
    qDebug()<<"Current groupe"<<currentGroup;
    qDebug()<<"Avaliblegroupe"<<groupeName;
+       
    trayIcon->setToolTip(groupeName[currentGroup]);
-   qDebug()<<map_path + rule->layouts.key(groupeName[currentGroup])+".png";
+   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 +"/"+ rule->layouts.key(groupeName[currentGroup])+".png"))
+     if (xkbConf->showFlag && QFile::exists( map_path +"/"+ xkbConf->layouts[currentGroup].layout+".png"))
      {
-          trayIcon-> setIcon(QIcon(map_path+"/"+rule->layouts.key(groupeName[currentGroup])+".png"));
+          trayIcon-> setIcon(QIcon(map_path+"/"+xkbConf->layouts[currentGroup].layout+".png"));
 
      }
      else
      {
-        QString layout=rule->layouts.key(groupeName[currentGroup]);
+        QString layout=xkbConf->layouts[currentGroup].layout;
         QFont font("Helvetica [Cronyx]",15);
         font.setBold(true);
         font.setLetterSpacing(QFont::PercentageSpacing,120);
diff -Nur axkb-0.4.2/src/keyswitch.cpp ../axkbMine/axkb-0.4.2/src/keyswitch.cpp
--- axkb-0.4.2/src/keyswitch.cpp	2009-05-16 15:15:25.000000000 +0700
+++ ../axkbMine/axkb-0.4.2/src/keyswitch.cpp	2011-05-23 21:38:12.000000000 +0700
@@ -56,9 +56,9 @@
         return;
     }
     setToolTip(groupeName[currentGroup]);
-     if (xkbConf->showFlag && QFile::exists(map_path + rule->layouts.key(groupeName[currentGroup])+".png"))
+     if (xkbConf->showFlag && QFile::exists(map_path + xkbConf->layouts[currentGroup].layout+".png"))
      {
-            setPixmap(QPixmap(map_path + rule->layouts.key(groupeName[currentGroup])+".png"));
+            setPixmap(QPixmap(map_path + xkbConf->layouts[currentGroup].layout+".png"));
 
      }
     else