From kde-commits  Sun Feb 03 18:46:51 2013
From: shivam makkar <amourphious1992 () gmail ! com>
Date: Sun, 03 Feb 2013 18:46:51 +0000
To: kde-commits
Subject: [kde-workspace/kbpreview] kcontrol/keyboard: added geometry and tool tip feature
Message-Id: <20130203184651.7E7E3A6091 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=135991722312432

Git commit 5f1c270c357c814cae1553325af129291a914c13 by shivam makkar.
Committed on 03/02/2013 at 19:46.
Pushed by makkar into branch 'kbpreview'.

added geometry and tool tip feature

M  +2    -1    kcontrol/keyboard/CMakeLists.txt
A  +499  -0    kcontrol/keyboard/preview/kbgeometry.cpp     [License: UNKNO=
WN]  *
A  +56   -0    kcontrol/keyboard/preview/kbgeometry.h     [License: UNKNOWN=
]  *
M  +126  -274  kcontrol/keyboard/preview/kbpreviewframe.cpp
M  +21   -18   kcontrol/keyboard/preview/kbpreviewframe.h
M  +33   -15   kcontrol/keyboard/preview/keyboardpainter.cpp
M  +9    -5    kcontrol/keyboard/preview/keyboardpainter.h

The files marked with a * at the end have a non valid license. Please read:=
 http://techbase.kde.org/Policies/Licensing_Policy and use the headers whic=
h are listed at that page.


http://commits.kde.org/kde-workspace/5f1c270c357c814cae1553325af129291a914c=
13

diff --git a/kcontrol/keyboard/CMakeLists.txt b/kcontrol/keyboard/CMakeList=
s.txt
index 973a39d..4ccbbca 100644
--- a/kcontrol/keyboard/CMakeLists.txt
+++ b/kcontrol/keyboard/CMakeLists.txt
@@ -116,10 +116,11 @@ set(kcm_keyboard_PART_SRCS
   preview/keyaliases.cpp
   preview/keyboardlayout.cpp
   preview/keyboardpainter.cpp
-  preview/keysymbols.cpp
+  preview/keys.cpp
   preview/keysymhelper.cpp
   preview/kbpreviewframe.cpp
   preview/keysym2ucs.cpp
+  preview/kbgeometry.cpp
 )
 =

 =

diff --git a/kcontrol/keyboard/preview/kbgeometry.cpp b/kcontrol/keyboard/p=
review/kbgeometry.cpp
new file mode 100644
index 0000000..8509985
--- /dev/null
+++ b/kcontrol/keyboard/preview/kbgeometry.cpp
@@ -0,0 +1,499 @@
+#include "kbgeometry.h"
+#include <QtGui>
+
+#include <QtGui/QX11Info>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/XKBlib.h>
+#include <X11/extensions/XKBrules.h>
+#include <fixx11h.h>
+#include <config-workspace.h>
+#include <KApplication>
+#include <KLocale>
+#include <QtCore/QFile>
+
+
+KbGeometry::KbGeometry()
+{
+    defSectionLeft=3D0;
+    defSectionTop=3D0;
+
+    pcModel=3D"pc101 pc102 pc104 pc105";
+    pcgeometries =3D "latitude";
+    macbooks =3D "macbook78 macbook79";
+    applealu =3D "applealu_ansi applealu_iso applealu_jis";
+    macs =3D "macintosh macintosh_old ibook powerbook macbook78 macbook79";
+    dell =3D "dell101 dellm65";
+
+}
+int KbGeometry::setIntProp(QString a,QString b){
+    int val;
+    float f;
+    if(b.contains(a)){
+        QString dvl=3Db.mid(b.indexOf(a));
+        dvl=3Ddvl.left(dvl.indexOf(";"));
+        dvl=3Ddvl.mid(dvl.indexOf("=3D")+1);
+        val=3Ddvl.toFloat();
+    }
+    else
+        val=3D0;
+    return val;
+}
+
+QString KbGeometry::setStrProp(QString a,QString b){
+    QString val;
+    if(b.contains(a)){
+        QString dvl=3Db.mid(b.indexOf(a));
+        dvl=3Ddvl.left(dvl.indexOf(";"));
+        dvl=3Ddvl.mid(dvl.indexOf("=3D")+1);
+        val=3Ddvl;
+    }
+    else
+        val=3D"";
+    return val;
+}
+
+void KbGeometry::extractShape(QString desc){
+    desc.remove(" ");
+    desc.remove("\t");
+    desc.remove("\n");
+    QList<QString>shapes;
+    shapes=3Ddesc.split("shape\"");
+    for(int i=3D1;i<shapes.size();i++){
+        Shape temp;
+        QString sh=3Dshapes.at(i);
+        QString th=3Dshapes.at(i);
+        QMessageBox q;
+
+        int idx=3Dsh.indexOf("\"",1);
+        QString shname=3Dsh.left(idx);
+        temp.name=3Dshname;
+        idx=3Dsh.indexOf("[");
+        sh=3Dsh.mid(idx+1);
+
+
+        idx=3Dsh.indexOf("]");
+        sh=3Dsh.left(idx);
+
+        QList<QString>sz=3Dsh.split(",");
+        temp.sizex=3Dsz.at(0).toFloat();
+        temp.sizey=3Dsz.at(1).toFloat();
+        if(temp.sizex=3D=3D0||temp.sizey=3D=3D0){
+
+            idx=3Dth.indexOf("[");
+            int tdx=3Dth.indexOf("[",idx+1);
+            th=3Dth.mid(tdx+1);
+            idx=3Dth.indexOf("]");
+            th=3Dth.left(idx);
+            QList<QString>sd=3Dth.split(",");
+            temp.sizex=3Dsd.at(0).toInt();
+            temp.sizey=3Dsd.at(1).toInt();
+        }
+        shapeList<<temp;
+        sz.clear();
+        QString f;
+        sh=3Dtemp.name;
+        sh.append(" : ");
+        sh.append(f.setNum(temp.sizex));
+        sh.append(" : ");
+        sh.append(f.setNum(temp.sizey));
+        //q.setText(sh);
+        //q.exec();
+    }
+}
+
+void KbGeometry::setDefaultValues(QString desc){
+    desc.remove(" ");
+    desc.remove("\t");
+    QString g,l;
+    defSectionLeft=3DsetIntProp("section.left=3D",desc);
+    l.setNum(defSectionLeft);
+    g.append(l);
+    g.append(" : ");
+    defSectionTop=3DsetIntProp("section.top=3D",desc);
+    l.setNum(defSectionTop);
+    g.append(l);
+    g.append(" : ");
+
+    defShape=3DsetStrProp("key.shape=3D",desc);
+
+    g.append(defShape);
+    g.append(" : ");
+
+    kbWidth=3DsetIntProp("width=3D",desc);
+    l.setNum(kbWidth);
+    g.append(l);
+    g.append(" : ");
+    kbHieght=3DsetIntProp("height=3D",desc);
+    l.setNum(kbHieght);
+    g.append(l);
+    g.append(" : ");
+    keygap=3DsetIntProp("key.gap=3D",desc);
+    l.setNum(keygap);
+    g.append(l);
+    g.append(" : ");
+    //QMessageBox a;
+    //a.setText(g);
+    //a.exec();
+}
+
+void KbGeometry::extractSections(QString desc){
+    QMessageBox q;
+    desc.append("\n");
+    QString sec=3Ddesc;
+    QString ma;
+    while(sec.contains("//")){
+        int k=3Dsec.indexOf("//");
+        QString first=3Dsec.left(k);
+        ma.append(first);
+        //q.setText(ma);
+        //q.exec();
+        int l=3Dsec.indexOf("\n",k+1);
+        sec=3Dsec.mid(l);
+        //q.setText(sec);
+        //q.exec();
+        //q.setText(first.setNum(k));
+        //q.exec();
+
+    }
+    ma.append(sec);
+    desc=3Dma;
+    desc.remove(" ");
+    desc.remove("\t");
+    QString dm,m;
+    QList<QString>seclist=3Ddesc.split("section\"");
+    setDefaultValues(seclist.at(0));
+    extractShape(desc);
+    for(int i=3D1;i<seclist.size();i++){
+        Section temp;
+        QList<QString>rlst=3Dseclist.at(i).split("row{");
+        QString inp=3Drlst.at(0);
+        int top=3DsetIntProp("top=3D",inp);
+        temp.ycordi=3Dtop+defSectionTop;
+        dm.setNum(temp.ycordi);
+        dm.append("=3D");
+        m.setNum(top);
+        dm.append(m);
+        dm.append("+");
+        m.setNum(defSectionTop);
+        dm.append(m);
+        dm.append("\n");
+        temp.secShape=3DsetStrProp("key.shape=3D",inp);
+        if(temp.secShape=3D=3D"")
+            temp.secShape=3DdefShape;
+        temp.gap=3DsetIntProp("key.gap=3D",inp);
+        if(temp.gap=3D=3D0)
+            temp.gap=3Dkeygap;
+        int left=3DsetIntProp("left=3D",inp);
+        temp.xcordi=3Dleft+defSectionLeft;
+        m.setNum(temp.xcordi);
+        dm.append(m);
+        dm.append("=3D");
+        m.setNum(left);
+        dm.append(m);
+        dm.append("+");
+        m.setNum(defSectionLeft);
+        dm.append(m);
+        dm.append("\n");
+        for(int j=3D1;j<rlst.size();j++){
+            temp.rowlist<<rlst.at(j);
+            dm.append(rlst.at(j));
+            dm.append("\n");
+        }
+        sections<<temp;
+        //q.setText(dm);
+        //q.exec();
+    }
+}
+
+QStringList KbGeometry :: splitKeys(QString desc){
+    desc.remove(" ");
+    desc.remove("\t");
+    desc.remove("\n");
+    QList <QString> lst=3Ddesc.split(",");
+    QList <QString> klst;
+    while(!lst.empty()){
+        QString temp=3Dlst.first();
+        if(temp=3D=3D"};")
+            break;
+        lst.pop_front();
+        if(temp.contains("{")){
+            temp.remove("{");
+            while(!lst.at(0).contains("}")){
+                temp.append(";");
+                temp.append(lst.first());
+                lst.pop_front();
+            }
+            temp.append(";");
+            temp.append(lst.first());
+            lst.pop_front();
+            if(temp.contains("};"))
+                temp=3Dtemp.left(temp.indexOf("};"));
+            temp.remove("}");
+        }
+        else{
+            if(temp.contains("};"))
+                temp=3Dtemp.left(temp.indexOf("};"));
+        }
+        klst << temp;
+
+
+    }
+    return klst;
+}
+
+void KbGeometry::extractRows(QString des){
+    extractSections(des);
+    for(int j=3D0;j<sections.size();j++){
+        Section current=3Dsections.at(j);
+        for(int k=3D0;k<current.rowlist.size();k++){
+
+            QString desc=3Dcurrent.rowlist.at(k);
+            desc=3Ddesc.left(desc.indexOf("};"));
+            desc.remove(" ");
+            desc.remove("\t");
+            Row temp;
+            temp.cx=3DsetIntProp("left=3D",desc)+current.xcordi;
+            temp.cy=3DsetIntProp("top=3D",desc)+current.ycordi;
+            QString tshape=3DsetStrProp("key.shape=3D",desc);
+            if (tshape=3D=3D""){
+                tshape=3Dcurrent.secShape.remove("\"");
+            }
+            temp.shapeRow=3Dtshape.remove("\"");
+            desc=3Ddesc.mid(desc.indexOf("keys{")+5);
+            temp.gap=3DsetIntProp("key.gap=3D",desc);
+            if(temp.gap=3D=3D0)
+                temp.gap=3Dcurrent.gap;
+            QMessageBox q;
+            //QString tst;
+            //tst.setNum(setIntProp("left=3D",desc));
+            //q.setText(tst);
+            //q.exec();
+            temp.keylist=3DsplitKeys(desc);
+            rows<<temp;
+
+       }
+
+    }
+    QMessageBox q;
+    for(int i=3D0;i<rows.size();i++){
+        QString a,b;
+        a.append(rows.at(i).shapeRow);
+        a.append(" : ");
+        a.append(b.setNum(rows.at(i).cx));
+        a.append(" : ");
+        a.append(b.setNum(rows.at(i).cy));
+        for(int n=3D0;n<rows.at(i).keylist.size();n++){
+            a.append("\n");
+            a.append(rows.at(i).keylist.at(n));
+        }
+      //q.setText(a);
+       //q.exec();
+    }
+}
+
+Shape KbGeometry :: getShape(QString shape){
+    for(int i=3D0;i<shapeList.size();i++){
+        Shape tmp=3DshapeList.at(i);
+        if(tmp.name=3D=3Dshape)
+            return tmp;
+    }
+    Shape k=3DgetShape("NORM");
+    return k;
+}
+
+void KbGeometry :: extractKeys(QString model){
+
+    QString desc=3DgetGeometryDescription(getGeometryfromModel(model));
+    extractRows(desc);
+    for(int i=3D0;i<rows.size();i++){
+        int totksz=3D0;
+        int gap=3Drows.at(i).gap;
+        for(int j=3D0;j<rows.at(i).keylist.size();j++){
+            KeyGm temp;
+            int addx=3D0;
+            QString dummy=3Drows.at(i).keylist.at(j);
+            QMessageBox g;
+            //g.setText(dummy);
+            //g.exec();
+            dummy.remove(" ");
+            int check=3D0;
+            if(dummy.contains(";")){
+                QList <QString>dummylst=3Ddummy.split(";");
+                int z=3D0;
+                for(int k=3D0;k<dummylst.size();k++){
+                    QString d=3Ddummylst.at(k);
+                    if(d.startsWith("<")){
+                        d.remove("<");
+                        d.remove(">");
+                        temp.name=3Dd;
+                    }
+                    if(d.startsWith("\"")){
+                        d.remove("\"");
+                        check=3D1;
+                        //g.setText(d);
+                        //g.exec();
+                        temp.shape=3DgetShape(d);
+                    }
+                    if(d.startsWith("shape=3D")){
+                        d=3DsetStrProp("shape=3D",d);
+                        d.remove("\"");
+                        temp.shape=3DgetShape(d);
+                        check=3D1;
+                    }
+                    bool ok;
+                    if(z=3D=3D0){
+                        addx=3Dd.toInt(&ok,10);
+                        if(ok)
+                            z=3D1;
+                    }
+                }
+            }
+            else{
+                dummy.remove("<");
+                dummy.remove(">");
+                temp.name=3Ddummy;
+                //g.setText(rows.at(i).shapeRow);
+                //g.exec();
+
+            }
+            if(check=3D=3D0)
+                temp.shape=3DgetShape(rows.at(i).shapeRow);
+            if(temp.shape.name=3D=3D"")
+                temp.shape=3DgetShape("NORM");
+            temp.cordx=3Drows.at(i).cx+totksz+addx+gap;
+            totksz+=3Dtemp.shape.sizex+addx+gap;
+            temp.cordy=3Drows.at(i).cy;
+            keys<<temp;
+        }
+    }
+    //QMessageBox q;
+    QString a,b;
+    int ptop=3D0;
+    for(int i=3D0;i<keys.size();i++){
+
+        KeyGm s=3Dkeys.at(i);
+        if(ptop!=3Ds.cordy){
+            ptop=3Ds.cordy;
+            a.append("\n");
+        }
+        a.append(s.name);
+        a.append(" : ");
+        a.append(b.setNum(s.cordx));
+        a.append(" : ");
+        a.append(b.setNum(s.cordy));
+        a.append(" : ");
+        a.append(s.shape.name);
+        a.append("  ");
+
+
+    }
+    QMessageBox q;
+    //q.setText(a);
+    //q.exec();
+}
+
+QString KbGeometry::makeGeometryStr(QString file,QString model){
+    QString geometry;
+    geometry.append(file);
+    geometry.append("/");
+    geometry.append(model);
+    return geometry;
+}
+
+QString KbGeometry::getGeometryfromModel(QString model){
+
+    QString geometry;
+
+    if(pcModel.contains(model))
+        return geometry=3DmakeGeometryStr("pc",model);
+
+    if(pcgeometries.contains(model))
+        return geometry=3DmakeGeometryStr("pc",model);
+
+    if(model=3D=3D"apple")
+        return geometry=3DmakeGeometryStr("macintosh","macintosh");
+    if(macbooks.contains(model)||macs.contains(model))
+        return geometry=3DmakeGeometryStr("macintosh","macintosh");
+
+    if(applealu.contains(model))
+        return geometry=3DmakeGeometryStr("macintosh",model);
+
+    if(dell.contains(model))
+        return geometry=3DmakeGeometryStr("dell",model);
+
+    if(model=3D=3D"hpmini110")
+        return geometry=3DmakeGeometryStr("hp","mini110");
+
+    if(model=3D=3D"hpdv5")
+        return geometry=3DmakeGeometryStr("hp","dv5");
+
+    if(model=3D=3D"pc98")
+        return geometry=3DmakeGeometryStr("nec",model);
+
+    QMessageBox q;
+    q.setText(i18n("Showing in Default Geometry"));
+    q.exec();
+
+    return geometry=3D"pc/pc104";
+
+}
+
+
+QString KbGeometry::getGeometryDescription(QString geometry){
+
+    QStringList temp=3Dgeometry.split("/");
+    QString description;
+    QString filename=3DfindGeometryBasedir();
+    filename.append(temp.at(0));
+
+    QFile file(filename);
+    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    QString content =3D file.readAll();
+    file.close();
+
+    QString geometryName=3Dtemp.at(1);
+    temp=3Dcontent.split("xkb_geometry");
+    for(int i=3D1;i<temp.size();i++){
+        QString tempstr=3Dtemp.at(i);
+        int k=3Dtempstr.indexOf("\"");
+        tempstr=3Dtempstr.mid(k);
+        k=3Dtempstr.indexOf("{");
+        tempstr=3Dtempstr.left(k);
+        tempstr.remove(" ");
+        tempstr.remove("\"");
+        if(tempstr=3D=3DgeometryName){
+            description=3Dtemp.at(i);
+            break;
+        }
+    }
+    return description;
+}
+
+QString KbGeometry::findGeometryBasedir()
+{
+    QString symBasedir;
+    QString xkbParentDir;
+
+    QString base(XLIBDIR);
+    if( base.count('/') >=3D 3 ) {
+        // .../usr/lib/X11 -> /usr/share/X11/xkb vs .../usr/X11/lib -> /us=
r/X11/share/X11/xkb
+        QString delta =3D base.endsWith("X11") ? "/../../share/X11" : "/..=
/share/X11";
+        QDir baseDir(base + delta);
+        if( baseDir.exists() ) {
+            xkbParentDir =3D baseDir.absolutePath();
+        }
+        else {
+            QDir baseDir(base + "/X11");	// .../usr/X11/lib/X11/xkb (old X=
Free)
+            if( baseDir.exists() ) {
+                xkbParentDir =3D baseDir.absolutePath();
+            }
+        }
+    }
+
+    if( xkbParentDir.isEmpty() ) {
+        xkbParentDir =3D "/usr/share/X11";
+    }
+    symBasedir=3DQString("%1/xkb/geometry/").arg(xkbParentDir);
+    return(symBasedir);
+}
diff --git a/kcontrol/keyboard/preview/kbgeometry.h b/kcontrol/keyboard/pre=
view/kbgeometry.h
new file mode 100644
index 0000000..f53761d
--- /dev/null
+++ b/kcontrol/keyboard/preview/kbgeometry.h
@@ -0,0 +1,56 @@
+#ifndef KBGEOMETRY_H
+#define KBGEOMETRY_H
+#include<QtCore>
+
+struct Shape{
+    QString name;
+    int sizex,sizey;
+};
+
+struct KeyGm {
+    QString name;
+    int cordx,cordy;
+    Shape shape;
+};
+
+struct Row{
+    int cx,cy,gap;
+    QString shapeRow;
+    QList<QString> keylist;
+};
+
+struct Section{
+    int xcordi,ycordi;
+    QList<QString> rowlist;
+    int gap;
+    QString secShape;
+};
+
+class KbGeometry
+{
+    QList <Shape> shapeList;
+    QList <Section> sections;
+    QList <Row> rows;
+    QString defShape;
+    int defSectionLeft,defSectionTop;
+    int setIntProp(QString a, QString b);
+    QString setStrProp(QString a,QString b);
+    Shape getShape(QString shape);
+    QString pcModel,pcgeometries,macbooks,applealu,macs,dell;
+    void extractShape(QString desc);
+    void setDefaultValues(QString desc);
+    void extractSections(QString desc);
+    void extractRows(QString desc);
+    QString makeGeometryStr(QString file,QString model);
+    QString getGeometryfromModel(QString model);
+    QString getGeometryDescription(QString geometry);
+    QString findGeometryBasedir();
+public:
+    QList <KeyGm> keys;
+    KbGeometry();
+    int kbWidth,kbHieght,keygap;
+    void extractKeys(QString desc);
+    QStringList splitKeys(QString desc);
+};
+
+#endif // KBGEOMETRY_H
diff --git a/kcontrol/keyboard/preview/kbpreviewframe.cpp b/kcontrol/keyboa=
rd/preview/kbpreviewframe.cpp
index 8ecc4f2..20e9363 100644
--- a/kcontrol/keyboard/preview/kbpreviewframe.cpp
+++ b/kcontrol/keyboard/preview/kbpreviewframe.cpp
@@ -21,331 +21,183 @@
 =

 #include <QtCore/QFile>
 #include <QtGui/QFont>
+#include <QHelpEvent>
+#include <QToolTip>
 =

 #include <KApplication>
 #include <KLocale>
 =

 =

-static const QColor keyBorderColor("#d4d4d4");
+static const QColor keyBorderColor("#E6E6E6");
 static const QColor lev12color("#d4d4d4");
 static const QColor lev34color("#FF3300");
-static const int sz=3D20, kszx=3D70, kszy=3D70;
-
-static const int xOffset[] =3D {15, 15, 40, 40 };
-static const int yOffset[] =3D {10, 40, 10, 40 };
 static const QColor color[] =3D { lev12color, lev12color, lev34color, lev3=
4color };
 =

 =

-// TODO: parse geometry files and display keyboard according to current ke=
yboard model
+
 =

 KbPreviewFrame::KbPreviewFrame(QWidget *parent) :
     QFrame(parent)
 {
      setFrameStyle( QFrame::Box );
      setFrameShadow(QFrame::Sunken);
+     setMouseTracking(true);
 }
 =

-void KbPreviewFrame::paintTLDE(QPainter &painter,int &x,int &y)
-{
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, kszx, kszy);
-
-    const QList <QString> symbols =3D keyboardLayout.TLDE.symbols;
-
-    for(int level=3D0; level<symbols.size(); level++) {
-    	painter.setPen(color[level]);
-    	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::Alig=
nTop, symbol.getKeySymbol(symbols.at(level)));
-    }
-
-}
+int KbPreviewFrame::keyAt(QPoint pos){
+    const int tooltip_range =3D 10;
+    for(int i=3D0;i<toolTipList.size();i++){
+        ToolTipText temp=3DtoolTipList.at(i);
+        if(temp.ttPoint.x()<=3Dpos.x()&&temp.ttPoint.x()+tooltip_range>=3D=
pos.x()&&temp.ttPoint.y()<=3Dpos.y()&&temp.ttPoint.y()+tooltip_range>=3Dpos=
.y()){
 =

-void KbPreviewFrame::paintAERow(QPainter &painter,int &x,int &y)
-{
-    paintTLDE(painter, x, y);
-
-    const int noAEk=3D12;
-    for(int i=3D0; i<noAEk; i++){
-        x+=3Dkszx;
-
-        painter.setPen(keyBorderColor);
-        painter.drawRect(x, y, kszx, kszy);
-
-        QList<QString> symbols =3D keyboardLayout.AE[i].symbols;
-
-        for(int level=3D0; level<symbols.size(); level++) {
-        	painter.setPen(color[level]);
-        	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::=
AlignTop, symbol.getKeySymbol(symbols.at(level)));
+            return i;
         }
     }
-
-    x +=3D kszx;
-
-    const int bkspszx=3D100,bk1x=3D10;//,bk1y=3D20,
-    const int bk2y=3D60;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,bkspszx,kszy);
-
-    painter.setPen(lev12color);
-//    painter.drawText(x+bk1x, y+bk1y,i18n("<--"));
-    painter.drawText(x+bk1x, y+bk2y,i18n("Backspace"));
+    return -1;
 }
 =

-void KbPreviewFrame::paintADRow(QPainter &painter,int &x,int&y)
-{
-    const int noADk=3D12;
-    const int tabszx=3D100;
-    const int tab3y=3D45;
+bool KbPreviewFrame::event(QEvent *event){
+    if (event->type() =3D=3D QEvent::ToolTip) {
+         QHelpEvent *helpEvent =3D static_cast<QHelpEvent *>(event);
+         int index =3D keyAt(helpEvent->pos());
+         if (index !=3D -1) {
+             QToolTip::showText(helpEvent->globalPos(), toolTipList[index]=
.ttString);
+         } else {
+             QToolTip::hideText();
+             event->ignore();
+         }
+
+         return true;
+     }
+     return QWidget::event(event);
+}
 =

+void KbPreviewFrame::paintEvent(QPaintEvent *){
+    //getkeyboardlayout("ua","Ukrainian");
+    //setWindowTitle(kblayout.Layoutname);
+    QPainter painter(this);
+    QFont kbfont("Ubuntu",9);
+    //alias.getAlias("qwerty","AD01");
+    painter.setFont(kbfont);
+    painter.setBrush(QBrush(Qt::darkGray));
+    //painter.setPen(Qt::black);
+    //painter.drawText(450,10,kblayout.Layoutname);
+    painter.drawRect(0,0,2*geometry.kbWidth+10,2*geometry.kbHieght);
     painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, tabszx,kszy);
-
-    painter.setPen(lev12color);
-//    painter.drawText(x+tab1x, y+tab1y,i18n("<--"));
-    painter.drawText(x+xOffset[0], y+tab3y, i18nc("Tab key", "Tab"));
-//    painter.drawText(x+tab2x, y+tab2y,i18n("-->"));
-    x+=3Dtabszx;
-
-
-    for(int i=3D0; i<noADk; i++){
-        QList<QString> symbols =3D keyboardLayout.AD[i].symbols;
-
+    painter.setBrush(QBrush(Qt::black,Qt::SolidPattern));
+    setScaleFactor(geometry.kbWidth,geometry.kbHieght);
+    for(int i=3D0;i<geometry.keys.size();i++){
+        KeyGm dummy =3D geometry.keys.at(i);
         painter.setPen(keyBorderColor);
-        painter.drawRect(x, y,kszx,kszy);
-
-        for(int level=3D0; level<symbols.size(); level++) {
-        	painter.setPen(color[level]);
-        	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::=
AlignTop, symbol.getKeySymbol(symbols.at(level)));
-        }
-
-        x+=3Dkszx;
-    }
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,kszx,kszy);
-
-    QList<QString> symbols =3D keyboardLayout.BKSL.symbols;
-
-    for(int level=3D0; level<symbols.size(); level++) {
-    	painter.setPen(color[level]);
-    	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::Alig=
nTop, symbol.getKeySymbol(symbols.at(level)));
+        painter.drawRect(scalex*dummy.cordx,scaley*dummy.cordy,scalex*dumm=
y.shape.sizex,scaley*dummy.shape.sizey);
+        writeKeySym(painter,dummy);
     }
 }
 =

-void KbPreviewFrame::paintACRow(QPainter &painter,int &x,int &y)
-{
-    const int sz =3D 20, kszx =3D 70, kszy =3D 70, capszx =3D 100;
-    const int noACk =3D 11;
-    const int lvl2x =3D 40, shifx =3D 10, shify =3D 60, retsz =3D 140;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,capszx,kszy);
-
-    painter.setPen(lev12color);
-//    painter.drawText(x+shifx, y+sz,i18n("^"));
-    painter.drawText(x+shifx, y+shify,i18n("Caps Lock"));
-    x+=3Dcapszx;
-
-    for(int i=3D0; i<noACk; i++){
-        painter.setPen(keyBorderColor);
-        painter.drawRect(x, y,kszx,kszy);
-
-        QList<QString> symbols =3D keyboardLayout.AC[i].symbols;
-
-        for(int level=3D0; level<symbols.size(); level++) {
-        	painter.setPen(color[level]);
-        	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::=
AlignTop, symbol.getKeySymbol(symbols.at(level)));
-        }
-
-        x+=3Dkszx;
+void KbPreviewFrame :: plotSym(QPainter &painter, KeyGm key, QString sym){
+    const int x=3D key.cordx,y=3D key.cordy;
+    int symx =3D key.shape.sizex/3-sym.length(),symy=3Dkey.shape.sizey/2+3;
+    if(key.shape.sizex=3D=3D0){
+        symx=3D6-sym.length();
     }
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,retsz,kszy);
-
+    if(key.shape.sizey=3D=3D0)
+        symy=3D12;
     painter.setPen(lev12color);
-//    painter.drawText(x+ret1x, y+ret1y,i18n("|"));
-//    painter.drawText(x+ret2x, y+ret2y,i18n("<--"));
-    painter.drawText(x+shify,y+lvl2x,i18n("Enter"));
+    QFont kbfont;
+    kbfont.setPointSize(7);
+    painter.setFont(kbfont);
+    painter.drawText(scalex*(x+symx),scaley*(y+symy),sym);
+    kbfont.setPointSize(9);
+    painter.setFont(kbfont);
 }
 =

-void KbPreviewFrame::paintABRow(QPainter &painter,int &x,int &y)
-{
-    const int noABk=3D10;
-    for(int i=3D0; i<noABk; i++) {
-        painter.setPen(keyBorderColor);
-        painter.drawRect(x, y,kszx,kszy);
-
-        QList<QString> symbols =3D keyboardLayout.AB[i].symbols;
-
-        for(int level=3D0; level<symbols.size(); level++) {
-        	painter.setPen(color[level]);
-        	painter.drawText(x+xOffset[level], y+yOffset[level], sz, sz, Qt::=
AlignTop, symbol.getKeySymbol(symbols.at(level)));
-        }
-
-        x+=3Dkszx;
+void KbPreviewFrame :: plotSym(QPainter &painter,KeyGm key,Keys sym){
+    const int x=3Dkey.cordx,y=3Dkey.cordy;
+    const int lvl1x =3D key.shape.sizex/5+1,lvl1y=3Dkey.shape.sizey/2+5;
+    const int lvl2x =3Dkey.shape.sizex/5+1,lvl2y=3Dkey.shape.sizey/5+5;
+    const int lvl3x=3Dkey.shape.sizex/2+1,lvl3y=3Dkey.shape.sizey/2+5;
+    const int lvl4x=3Dkey.shape.sizex/2+1,lvl4y=3Dkey.shape.sizey/5+5;
+    const int levelx_Pos[] =3D { lvl1x , lvl2x , lvl3x , lvl4x };
+    const int levely_Pos[] =3D { lvl1y , lvl2y , lvl3y ,lvl4y };
+
+    QPoint tp;
+    tp.setX(scalex*x);
+    tp.setY(scaley*y);
+    QString ts=3Dsym.keyVal;
+    ToolTipText temp;
+    temp.ttPoint=3Dtp;
+    temp.ttString=3Dts;
+    toolTipList<<temp;
+    for(int level =3D 0; level < sym.klst.size(); level++){
+        painter.setPen(color[level]);
+        painter.drawText(scalex*(x+levelx_Pos[level]),scaley*(y+levely_Pos=
[level]),symbol.getKeySymbol(sym.klst.at(level)));
     }
 }
 =

-void KbPreviewFrame::paintBottomRow(QPainter &painter,int &x,int &y)
-{
-    const int txtx=3D30, txty=3D35, ctrlsz=3D100, altsz=3D100, spsz=3D400,=
 kszy=3D70;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, ctrlsz, kszy);
-    painter.setPen(lev12color);
-    painter.drawText(x+txtx, y+txty,i18n("Ctrl"));
-
-    x+=3Dctrlsz;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, altsz, kszy);
-    painter.setPen(lev12color);
-    painter.drawText(x+txtx, y+txty,i18n("Alt"));
-
-    x+=3Daltsz;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, spsz, kszy);
-
-    x+=3Dspsz;
-
-    painter.drawRect(x, y, altsz, kszy);
-
-    painter.setPen(lev34color);
-    painter.drawText(x+txtx, y+txty,i18n("AltGr"));
-
-    x+=3Dctrlsz;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, ctrlsz, kszy);
-
-    painter.setPen(lev12color);
-    painter.drawText(x+txtx, y+txty, i18n("Ctrl"));
-}
-
-void KbPreviewFrame::paintFnKeys(QPainter &painter,int &x,int &y)
-{
-    const int escsz=3D50, escx=3D20, escy=3D55;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y, escsz, escsz);
-
-    painter.setPen(lev12color);
-    painter.drawText(escx, escy, i18n("Esc"));
-
-    const int spacex=3D50;
-    x+=3Dspacex;
-
-    const int fnkeyspace=3D60, fnkeysizex=3D50, fnkeysizey=3D50, fkc=3D15,=
 fky=3D30, fnkig=3D4, fng=3D3;
-    int f=3D1;
+void KbPreviewFrame :: writeKeySym(QPainter &painter, KeyGm key){
+
+    int plotted=3D0;
+
+    const QString key_group[] =3D { "AE" , "AD" , "AC" , "AB" , "TLDE" , "=
BKSL" };
+
+    for(int group_no =3D 0 ; group_no < 6 ; group_no++){
+        if(key.name.startsWith(key_group[group_no])){
+            QString ind=3Dkey.name.right(2);
+            int index=3Dind.toInt();
+            Keys sym;
+            if (group_no =3D=3D 0)
+                sym=3Dkblayout.AE[index-1];
+            if (group_no =3D=3D 1)
+                sym=3Dkblayout.AD[index-1];
+            if (group_no =3D=3D 2)
+                sym=3Dkblayout.AC[index-1];
+            if (group_no =3D=3D 3)
+                sym=3Dkblayout.AB[index-1];
+            if (group_no =3D=3D 4)
+                sym=3Dkblayout.TLDE;
+            if (group_no =3D=3D 5)
+                sym=3Dkblayout.BKSL;
+            plotSym(painter,key,sym);
+            plotted=3D1;
 =

-    for(int i=3D0;i<fng;i++){
-        x+=3Dspacex;
-
-        for(int j=3D0;j<fnkig;j++){
-            x +=3D fnkeyspace;
-            painter.setPen(keyBorderColor);
-            painter.drawRect(x, y, fnkeysizex, fnkeysizey);
-
-            painter.setPen(lev12color);
-            painter.drawText(x+fkc, y+fky, i18nc("Function key", "F%1", f)=
);
-            f++;
         }
     }
+    if(plotted=3D=3D0){
+        QString sym=3Dkey.name;
+        plotSym(painter,key,sym);
+    }
 }
 =

-void KbPreviewFrame::paintEvent(QPaintEvent *)
-{
-    QPainter painter(this);
-
-    QFont kbfont;
-    kbfont.setPointSize(12);
-
-    painter.setFont(kbfont);
-    painter.setBrush(QBrush(Qt::darkGray));
-
-    const int strtx=3D0,strty=3D0,endx=3D1390,endy=3D490,kszy=3D70;
-    const int row1x=3D10,row1y=3D30,row2x=3D10,row2y=3D90,row5x=3D10,row5y=
=3D330,row3x=3D10,row3y=3D170,shifx=3D10,shify=3D60,row4x=3D10,row4y=3D250,=
row6x=3D110,row6y=3D410;
-    const int shiftsz=3D155;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(strtx, strty, endx, endy);
-
-    painter.setPen(lev12color);
-    painter.setBrush(QBrush(Qt::black));
-
-    int x, y;
-    x=3Drow1x;
-    y=3Drow1y;
-
-    paintFnKeys(painter,x, y);
-
-    x=3Drow2x;
-    y=3Drow2y;
-
-    paintAERow(painter,x, y);
-
-    x=3Drow3x;
-    y=3Drow3y;
-
-    paintADRow(painter,x, y);
-
-    x=3Drow4x;
-    y=3Drow4y;
-
-    paintACRow(painter,x, y);
-
-    x=3Drow5x;
-    y=3Drow5y;
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,shiftsz,kszy);
-    painter.setPen(lev12color);
-    painter.drawText(x+shifx, y+shify,i18n("Shift"));
-    x+=3Dshiftsz;
-
-    paintABRow(painter,x, y);
-
-    painter.setPen(keyBorderColor);
-    painter.drawRect(x, y,shiftsz,kszy);
-    painter.setPen(lev12color);
-    painter.drawText(x+shifx, y+shify,i18n("Shift"));
-
-    x=3Drow6x;
-    y=3Drow6y;
-
-    paintBottomRow(painter,x, y);
-
-    if( symbol.isFailed() ) {
-        painter.setPen(keyBorderColor);
-        painter.drawRect(strtx, strty, endx, endy);
-
-        const int midx=3D470, midy=3D240;
-        painter.setPen(lev12color);
-        painter.drawText(midx, midy, i18n("No preview found"));
-    }
 =

+void KbPreviewFrame :: setScaleFactor(int width,int height){
+    scalex=3D1030/width;
+    scaley=3D490/height;
+    scalex=3D2;
+    scaley=3D2;
 }
 =

 =

-void KbPreviewFrame::generateKeyboardLayout(const QString& layout, const Q=
String& layoutVariant)
+void KbPreviewFrame::generateKeyboardLayout(const QString& country, const =
QString& layoutvariant,const QString& model)
 {
-    QString filename =3D keyboardLayout.findSymbolBaseDir();
-    filename.append(layout);
+    QString filename=3Dkblayout.findSymbolbasedir();
+    filename.append(country);
 =

     QFile file(filename);
     file.open(QIODevice::ReadOnly | QIODevice::Text);
     QString content =3D file.readAll();
     file.close();
 =

-    QList<QString> symstr =3D content.split("xkb_symbols ");
+    QList<QString> symstr;
+    symstr=3Dcontent.split("xkb_symbols ");
 =

-    if( layoutVariant.isEmpty() ) {
-        keyboardLayout.generateLayout(symstr.at(1), layout);
-    }
-    else {
-        for(int i=3D1;i<symstr.size();i++) {
+    geometry.extractKeys(model);
+
+    if(layoutvariant=3D=3D"")
+        kblayout.generateLayout(symstr.at(1),country);
+
+    else
+    {
+        for(int i=3D1;i<symstr.size();i++){
             QString h=3Dsymstr.at(i);
             int k=3Dh.indexOf("\"");
             h=3Dh.mid(k);
@@ -353,12 +205,12 @@ void KbPreviewFrame::generateKeyboardLayout(const QSt=
ring& layout, const QString
             h=3Dh.left(k);
             h=3Dh.remove(" ");
             QString f=3D"\"";
-            f.append(layoutVariant);
+            f.append(layoutvariant);
             f.append("\"");
             f=3Df.remove(" ");
 =

             if(h=3D=3Df){
-                keyboardLayout.generateLayout(symstr.at(i), layout);
+                kblayout.generateLayout(symstr.at(i),country);
                 break;
             }
         }
diff --git a/kcontrol/keyboard/preview/kbpreviewframe.h b/kcontrol/keyboard=
/preview/kbpreviewframe.h
index 23c8704..79913d3 100644
--- a/kcontrol/keyboard/preview/kbpreviewframe.h
+++ b/kcontrol/keyboard/preview/kbpreviewframe.h
@@ -21,35 +21,38 @@
 #include "keyboardlayout.h"
 #include "keysymhelper.h"
 #include "keyaliases.h"
-
-#include <QtGui/QPainter>
+#include "kbgeometry.h"
+#include <QPainter>
 #include <QtGui/QFrame>
 =

+struct ToolTipText{
+	QPoint ttPoint;
+	QString ttString;
+};
+
 class KbPreviewFrame : public QFrame
 {
     Q_OBJECT
-    =

 private:
-	void paintTLDE(QPainter &painter, int &x, int &y);
-	void paintAERow(QPainter &painter, int &x, int &y);
-	void paintADRow(QPainter &painter, int &x, int &y);
-	void paintACRow(QPainter &painter, int &x, int &y);
-	void paintABRow(QPainter &painter, int &x, int &y);
-	void paintBottomRow(QPainter &painter, int &x, int &y);
-	void paintFnKeys(QPainter &painter, int &x, int &y);
-
+	int scalex,scaley;
+    void setScaleFactor(int width,int hieght);
+    void writeKeySym(QPainter &painter,KeyGm key);
+    void plotSym(QPainter &painter,KeyGm key,Keys sym);
+    void plotSym(QPainter &painter,KeyGm key,QString sym);
+    void getkeyboardlayout(QString country, QString layoutvariant);
 	KeySymHelper symbol;
 	Aliases alias;
-    KeyboardLayout keyboardLayout;
-	=

 public:
+	QList<ToolTipText> toolTipList;
     explicit KbPreviewFrame(QWidget *parent =3D 0);
+    void paintEvent(QPaintEvent *);
+    bool event(QEvent *event);
+    int keyAt(QPoint pos);
+    KbGeometry geometry;
+    KeyboardLayout kblayout;
+    void generateKeyboardLayout(const QString &country, const QString &lay=
outvariant, const QString &model);
 =

-    void paintEvent(QPaintEvent * event);
-    void generateKeyboardLayout(const QString &country, const QString &lay=
outVariant);
-    QString getLayoutName() const {
-    	return keyboardLayout.getLayoutName();
-    }
+    =

 };
 =

 #endif // KBPREVIEWFRAME_H =

diff --git a/kcontrol/keyboard/preview/keyboardpainter.cpp b/kcontrol/keybo=
ard/preview/keyboardpainter.cpp
index b9fbf24..e03226e 100644
--- a/kcontrol/keyboard/preview/keyboardpainter.cpp
+++ b/kcontrol/keyboard/preview/keyboardpainter.cpp
@@ -17,37 +17,55 @@
  */
 =

 #include "keyboardpainter.h"
+#include "ui_KeyboardPainter.h"
 =

 #include <QtGui/QHBoxLayout>
 #include <QtGui/QVBoxLayout>
-#include <QtGui/QPushButton>
+#include <QToolTip>
+#include <QHelpEvent>
 =

-#include <KLocale>
-
-
-KeyboardPainter::KeyboardPainter():
+KeyboardPainter::KeyboardPainter() :
+    previewDialog(new QDialog(this)),
     kbframe(new KbPreviewFrame(this)),
-    exitButton(new QPushButton(i18n("Close"),this))
+    exitButton(new QPushButton(tr("Close"),this))
 {
+    previewDialog->setFixedSize(1030,520);
     kbframe->setFixedSize( 1030, 490 );
-    exitButton->setFixedSize(120, 30);
-
-    QVBoxLayout* vLayout =3D new QVBoxLayout( this );
+    exitButton->setFixedSize(120,30);
+    connect(exitButton,SIGNAL(clicked()),this,SLOT(close()));
+    QVBoxLayout*const vLayout =3D new QVBoxLayout( this );
     vLayout->addWidget(kbframe);
     vLayout->addWidget(exitButton);
-
-    connect(exitButton, SIGNAL(clicked()), this, SLOT(close()));
-
-    setWindowTitle(kbframe->getLayoutName());
+    setWindowTitle(kbframe->kblayout.getLayoutName());
+    setMouseTracking(true);
 }
 =

-void KeyboardPainter::generateKeyboardLayout(const QString& layout, const =
QString& variant)
+void KeyboardPainter::generateKeyboardLayout(QString country, QString vari=
ant,QString model)
 {
-    kbframe->generateKeyboardLayout(layout, variant);
+    kbframe->generateKeyboardLayout(country,variant,model);
+    previewDialog->setFixedSize((2*kbframe->geometry.kbWidth+20),(2*kbfram=
e->geometry.kbHieght+50));
+    kbframe->setFixedSize((2*kbframe->geometry.kbWidth+20),(2*kbframe->geo=
metry.kbHieght));
+}
+
+bool KeyboardPainter::event(QEvent *event){
+    if (event->type() =3D=3D QEvent::ToolTip) {
+         QHelpEvent *helpEvent =3D static_cast<QHelpEvent *>(event);
+         int index =3D kbframe->keyAt(helpEvent->pos());
+         if (index !=3D -1) {
+             QToolTip::showText(helpEvent->globalPos(), kbframe->toolTipLi=
st[index].ttString);
+         } else {
+             QToolTip::hideText();
+             event->ignore();
+         }
+
+         return true;
+     }
+     return QWidget::event(event);
 }
 =

 KeyboardPainter::~KeyboardPainter()
 {
+    delete previewDialog;
     delete kbframe;
     delete exitButton;
 }
diff --git a/kcontrol/keyboard/preview/keyboardpainter.h b/kcontrol/keyboar=
d/preview/keyboardpainter.h
index 39382be..e624464 100644
--- a/kcontrol/keyboard/preview/keyboardpainter.h
+++ b/kcontrol/keyboard/preview/keyboardpainter.h
@@ -20,11 +20,14 @@
 #ifndef KEYBOARDPAINTER_H
 #define KEYBOARDPAINTER_H
 =

-#include "kbpreviewframe.h"
-
 #include <QtGui/QDialog>
+#include <QtGui/QPushButton>
+
+#include"kbpreviewframe.h"
 =

-class QPushButton;
+namespace Ui {
+class keyboardpainter;
+}
 =

 class KeyboardPainter : public QDialog
 {
@@ -33,10 +36,11 @@ class KeyboardPainter : public QDialog
 public:
     explicit KeyboardPainter();
     ~KeyboardPainter();
-
-    void generateKeyboardLayout(const QString& layout, const QString& vari=
ant);
+    void generateKeyboardLayout(QString country, QString layoutvariant, QS=
tring model);
     =

 private:
+	bool event(QEvent *event);
+    QDialog *previewDialog;
     KbPreviewFrame *kbframe;
     QPushButton *exitButton;
 };