diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp index 4008f49..f5b0c44 100644 --- a/src/MainWidget.cpp +++ b/src/MainWidget.cpp @@ -43,7 +43,7 @@ #define R1LEN 13 #define R2LEN 10 #define R3LEN 9 -#define R4LEN 7 +#define R4LEN 8 bool shutting=false; @@ -69,9 +69,9 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const //TQString k3s="ASDFGHJKL"; unsigned int kc3[R3LEN] = {38,39,40,41,42,43,44,45,46}; //,{47,48}; - //TQString k4="zxcvbnm"; //,./"; - //TQString k4s="ZXCVBNM"; - unsigned int kc4[R4LEN] = {52,53,54,55,56,57,58};//59,60,61}; + //TQString k4=" zxcvbnm"; //,./"; + //TQString k4s=" ZXCVBNM"; + unsigned int kc4[R4LEN] = {94,52,53,54,55,56,57,58};//59,60,61}; int stx=15; int sty=15; @@ -246,7 +246,7 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const lshft = new VButton ( this,"" ); lshft->setKeyCode ( 50 ); lshft->move ( stx,sty+ ( 4*35 ) ); - lshft->resize ( 80,30 ); + lshft->resize ( 45,30 ); lshft->setText ( "Shift" ); lshft->setToggleButton ( true ); connect ( lshft,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( toggleShift() ) ); @@ -259,7 +259,7 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const v->setKeyCode ( kc4[a] ); //v->setText ( k4.mid ( a,1 ) ); //v->setShiftText ( k4s.mid ( a,1 ) ); - v->move ( stx+35+16+35+ ( 35*a ),sty+ ( 4*35 ) ); + v->move ( stx+35+15+ ( 35*a ),sty+ ( 4*35 ) ); btns.append ( v ); v->res(); connect ( v,TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); @@ -399,9 +399,9 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const int padx= 550; - TQString txt[9] = { "Ho\nme", TQString::fromUtf8("▲"), "Pg\nUp", + TQString txt[9] = { "Hm", TQString::fromUtf8("▲"), "Pu", TQString::fromUtf8("◄"), " ", TQString::fromUtf8("►"), - "End", TQString::fromUtf8("▼"), "Pg\nDn" }; + "End", TQString::fromUtf8("▼"), "Pd" }; TQString nump[9] = {"7","8","9","4","5","6","1","2","3"}; int val=0; int nval[9] = {16,17,18,13,14,15,10,11,12}; @@ -445,7 +445,7 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const numl->setKeyCode(77); numl->move(padx,sty+(1*35)); numl->res(); - numl->setText("Num\nLock"); + numl->setText("Nlk"); numl->setToggleButton ( true ); other_keys.append(numl); connect ( numl, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) );