summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2021-02-15 12:28:24 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2021-02-15 12:28:24 +0900
commit74abd47697ddc9a7ca0dbc7cbba618d94d8cf92a (patch)
tree736d4165a47f8f82ead7cb519e8c9955fa2cb48f
parent2af99da072d82ae809ef57f83911a7f4c45da1f5 (diff)
downloadkvkbd-74abd476.tar.gz
kvkbd-74abd476.zip
LWin and RWin have been set back to toggle keys, as they are used as Super_L/R modifiers in X.
Minor tweaks to the key position on the last row. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/MainWidget.cpp30
1 files changed, 10 insertions, 20 deletions
diff --git a/src/MainWidget.cpp b/src/MainWidget.cpp
index 8bbe5a3..6ee1fa1 100644
--- a/src/MainWidget.cpp
+++ b/src/MainWidget.cpp
@@ -303,8 +303,6 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const
mod_keys.append ( rshft );
rshft->res();
-
-
lctrl = new VButton ( this,"" );
lctrl->resize ( 45,30 );
lctrl->move ( stx, sty+ ( 5*35 ) );
@@ -314,32 +312,29 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const
mod_keys.append ( lctrl );
lctrl->res();
-
lwin = new VButton ( this,"" );
lwin->resize ( 50,30 );
lwin->move ( lctrl->x() +lctrl->width() +5, sty+ ( 5*35 ) );
lwin->setText ( "LWin" );
lwin->setKeyCode ( 133 );
- lwin->setToggleButton ( false );
- connect ( lwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) );
- other_keys.append( lwin );
+ lwin->setToggleButton ( true );
+ mod_keys.append ( lwin );
lwin->res();
-
lalt = new VButton ( this,"" );
lalt->resize ( 45,30 );
- lalt->move ( lwin->x() +lwin->width() +5, sty+ ( 5*35 ) );
+ lalt->move ( lwin->x() +lwin->width() +6, sty+ ( 5*35 ) );
lalt->setText ( "Alt" );
lalt->setKeyCode ( 64 );
lalt->setToggleButton ( true );
mod_keys.append ( lalt );
lalt->res();
-
VButton *space = new VButton ( this,"" );
space->setKeyCode ( 65 );
- space->resize ( 5*35+28,30 );
- space->move ( 5+lalt->x() +lalt->width(),sty+ ( 5*35 ) );
+ space->resize ( 135,30 );
+ space->move ( lalt->x() +lalt->width() +5, sty+ ( 5*35 ) );
+
connect ( space, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) );
space->res();
other_keys.append(space);
@@ -353,21 +348,18 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const
mod_keys.append ( ralt );
ralt->res();
-
rwin = new VButton ( this,"" );
rwin->resize ( 50,30 );
- rwin->move ( ralt->x() +ralt->width() +5, sty+ ( 5*35 ) );
+ rwin->move ( ralt->x() +ralt->width() +6, sty+ ( 5*35 ) );
rwin->setText ( "RWin" );
rwin->setKeyCode ( 134 );
- rwin->setToggleButton ( false );
- connect ( rwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) );
- other_keys.append( rwin );
+ rwin->setToggleButton ( true );
+ mod_keys.append ( rwin );
rwin->res();
-
mnu = new VButton ( this,"" );
mnu->resize ( 50,30 );
- mnu->move ( rwin->x() +rwin->width() +5, sty+ ( 5*35 ) );
+ mnu->move ( rwin->x() +rwin->width() +6, sty+ ( 5*35 ) );
mnu->setText ( "Menu" );
mnu->setKeyCode ( 117 );
mnu->setToggleButton ( false );
@@ -375,7 +367,6 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const
other_keys.append(mnu);
mnu->res();
-
rctrl = new VButton ( this,"" );
rctrl->resize ( 45,30 );
rctrl->move ( 5+mnu->x() +mnu->width(), sty+ ( 5*35 ) );
@@ -410,7 +401,6 @@ MainWidget::MainWidget ( TDEAboutData *about, bool tren, TQWidget *parent, const
setPaletteBackgroundColor ( TQt::black );
setFocusPolicy ( TQ_NoFocus );
-
int padx= 550;
TQString txt[9] = { "Ho\nme", TQString::fromUtf8("▲"), "Pg\nUp",
TQString::fromUtf8("◄"), " ", TQString::fromUtf8("►"),