[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/plasma/applets/plasmaboard
From: Björn Ruberg <bjoern () ruberg-wegener ! de>
Date: 2009-04-26 12:39:46
Message-ID: 1240749586.408578.22101.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 959466 by ruberg:
M +1 -1 ArrowTopKey.cpp
M +94 -75 widget.cpp
M +0 -1 widget.h
--- trunk/playground/base/plasma/applets/plasmaboard/ArrowTopKey.cpp #959465:959466
@@ -18,7 +18,7 @@
***************************************************************************/
-#include "ArrowTopKey.h"cy
+#include "ArrowTopKey.h"4
#include <QPainter>
#include <plasma/theme.h>
--- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp #959465:959466
@@ -37,10 +37,34 @@
#include <KConfigGroup>
-
#include <math.h>
#include <plasma/theme.h>
+#define BACKSPACEKEY 0
+#define TABKEY 1
+#define ENTERKEY 2
+#define CAPSKEY 3
+#define SHIFT_L_KEY 4
+#define SHIFT_R_KEY 5
+#define CTLKEY 6
+#define META_L_KEY 7
+#define ALT_L_KEY 8
+#define META_R_KEY 11
+
+#define ALTGRKEY 10
+
+#define HOMEKEY 16
+#define ENDKEY 17
+#define INSKEY 18
+#define DELKEY 19
+#define PGUPKEY 20
+#define PGDOWNKEY 21
+
+#define ARROWTOPKEY 22
+#define ARROWLEFTKEY 23
+#define ARROWBOTTOMKEY 24
+#define ARROWRIGHTKEY 25
+
PlasmaboardWidget::PlasmaboardWidget(QGraphicsWidget *parent)
: Plasma::Applet(parent)
{
@@ -66,10 +90,6 @@
}
-void PlasmaboardWidget::init(){
-
-}
-
void PlasmaboardWidget::resetKeyboard(){
int i = 0;
@@ -82,7 +102,6 @@
}
i = 0;
-
while ( i < 14 ) {
delete funcKeys[i];
i++;
@@ -117,10 +136,10 @@
i++;
}
- extKeys[22] = new ArrowTopKey(this);
- extKeys[23] = new ArrowLeftKey(this);
- extKeys[24] = new ArrowBottomKey(this);
- extKeys[25] = new ArrowRightKey(this);
+ extKeys[ARROWTOPKEY] = new ArrowTopKey(this);
+ extKeys[ARROWLEFTKEY] = new ArrowLeftKey(this);
+ extKeys[ARROWBOTTOMKEY] = new ArrowBottomKey(this);
+ extKeys[ARROWRIGHTKEY] = new ArrowRightKey(this);
m_layout->addItem(extKeys[0], 0, 0, 1, 2, Qt::AlignLeft);
for(i = 1; i < 13; i++){
@@ -166,43 +185,43 @@
initBasicKeyboard(1);
- m_layout->addItem(extKeys[23], 5, 29, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(extKeys[ARROWLEFTKEY], 5, 29, 1, 2, Qt::AlignLeft);
int col = 31;
- m_layout->addItem(extKeys[16], 1, col, 1, 2, Qt::AlignLeft);
- extKeys[16]->setKeycode(XK_Home, true);
- extKeys[16]->setText("Home");
+ m_layout->addItem(extKeys[HOMEKEY], 1, col, 1, 2, Qt::AlignLeft);
+ extKeys[HOMEKEY]->setKeycode(XK_Home, true);
+ extKeys[HOMEKEY]->setText("Home");
- m_layout->addItem(extKeys[17], 2, col, 1, 2, Qt::AlignLeft);
- extKeys[17]->setKeycode(XK_End, true);
- extKeys[17]->setText("End");
+ m_layout->addItem(extKeys[ENDKEY], 2, col, 1, 2, Qt::AlignLeft);
+ extKeys[ENDKEY]->setKeycode(XK_End, true);
+ extKeys[ENDKEY]->setText("End");
- m_layout->addItem(extKeys[18], 3, col, 1, 2, Qt::AlignLeft);
- extKeys[18]->setKeycode(XK_Insert, true);
- extKeys[18]->setText("Ins");
+ m_layout->addItem(extKeys[INSKEY], 3, col, 1, 2, Qt::AlignLeft);
+ extKeys[INSKEY]->setKeycode(XK_Insert, true);
+ extKeys[INSKEY]->setText("Ins");
- m_layout->addItem(extKeys[22], 4, col, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(extKeys[ARROWTOPKEY], 4, col, 1, 2, Qt::AlignLeft);
- m_layout->addItem(extKeys[24], 5, col, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(extKeys[ARROWBOTTOMKEY], 5, col, 1, 2, Qt::AlignLeft);
col+=2;
- m_layout->addItem(extKeys[25], 5, col, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(extKeys[ARROWRIGHTKEY], 5, col, 1, 2, Qt::AlignLeft);
- m_layout->addItem(extKeys[19], 1, col, 1, 2, Qt::AlignLeft);
- extKeys[19]->setKeycode(XK_Delete, true);
- extKeys[19]->setText("Del");
+ m_layout->addItem(extKeys[DELKEY], 1, col, 1, 2, Qt::AlignLeft);
+ extKeys[DELKEY]->setKeycode(XK_Delete, true);
+ extKeys[DELKEY]->setText("Del");
- m_layout->addItem(extKeys[20], 2, col, 1, 2, Qt::AlignLeft);
- extKeys[20]->setKeycode(XK_Page_Up, true);
- extKeys[20]->setText("PgUp");
+ m_layout->addItem(extKeys[PGUPKEY], 2, col, 1, 2, Qt::AlignLeft);
+ extKeys[PGUPKEY]->setKeycode(XK_Page_Up, true);
+ extKeys[PGUPKEY]->setText("PgUp");
- m_layout->addItem(extKeys[21], 3, col, 1, 2, Qt::AlignLeft);
- extKeys[21]->setKeycode(XK_Page_Down, true);
- extKeys[21]->setText("PgDw");
+ m_layout->addItem(extKeys[PGDOWNKEY], 3, col, 1, 2, Qt::AlignLeft);
+ extKeys[PGDOWNKEY]->setKeycode(XK_Page_Down, true);
+ extKeys[PGDOWNKEY]->setText("PgDw");
m_layout->setColumnPreferredWidth(30,width/30);
@@ -223,12 +242,12 @@
i++;
}
- funcKeys[0] = new BackspaceKey(this);
- funcKeys[1] = new TabKey(this);
- funcKeys[2] = new EnterKey(this);
- funcKeys[3] = new CapsKey(this);
- funcKeys[4] = new ShiftKey(this);
- funcKeys[5] = new ShiftKey(this);
+ funcKeys[BACKSPACEKEY] = new BackspaceKey(this);
+ funcKeys[TABKEY] = new TabKey(this);
+ funcKeys[ENTERKEY] = new EnterKey(this);
+ funcKeys[CAPSKEY] = new CapsKey(this);
+ funcKeys[SHIFT_L_KEY] = new ShiftKey(this);
+ funcKeys[SHIFT_R_KEY] = new ShiftKey(this);
i = 0;
while ( i < 48 ) {
@@ -246,21 +265,21 @@
for(x = 0; x<=12; x++){
m_layout->addItem(alphaKeys[x], row, x*2, 1, 2, Qt::AlignLeft);
}
- m_layout->addItem(funcKeys[0], row, x*2, 1, 4, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[BACKSPACEKEY], row, x*2, 1, 4, Qt::AlignLeft);
row++;
- m_layout->addItem(funcKeys[1], row, 0, 1, 3, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[TABKEY], row, 0, 1, 3, Qt::AlignLeft);
int t = 3;
for(x = 13; x<=24; x++){
m_layout->addItem(alphaKeys[x], row, t, 1, 2, Qt::AlignLeft);
t+=2;
}
- m_layout->addItem(funcKeys[2], row, t+1, 2, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[ENTERKEY], row, t+1, 2, 2, Qt::AlignLeft);
row++;
- m_layout->addItem(funcKeys[3], row, 0, 1, 4, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[CAPSKEY], row, 0, 1, 4, Qt::AlignLeft);
t = 4;
for(x = 25; x<=36; x++){
m_layout->addItem(alphaKeys[x], row, t, 1, 2, Qt::AlignLeft);
@@ -269,22 +288,22 @@
row++;
- m_layout->addItem(funcKeys[4], row, 0, 1, 3, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[SHIFT_L_KEY], row, 0, 1, 3, Qt::AlignLeft);
t = 3;
for(x = 37; x<=47; x++){
m_layout->addItem(alphaKeys[x], row, t, 1, 2, Qt::AlignLeft);
t+=2;
}
- m_layout->addItem(funcKeys[5], row, t, 1, 5, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[SHIFT_R_KEY], row, t, 1, 5, Qt::AlignLeft);
row++;
- m_layout->addItem(funcKeys[6], row, 0, 1, 2, Qt::AlignLeft);
- m_layout->addItem(funcKeys[7], row, 2, 1, 2, Qt::AlignLeft);
- m_layout->addItem(funcKeys[8], row, 4, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[CTLKEY], row, 0, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[META_L_KEY], row, 2, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[ALT_L_KEY], row, 4, 1, 2, Qt::AlignLeft);
m_layout->addItem(funcKeys[9], row, 6, 1, 14, Qt::AlignLeft);
- m_layout->addItem(funcKeys[10], row, 20, 1, 2, Qt::AlignLeft);
- m_layout->addItem(funcKeys[11], row, 22, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[ALTGRKEY], row, 20, 1, 2, Qt::AlignLeft);
+ m_layout->addItem(funcKeys[META_R_KEY], row, 22, 1, 2, Qt::AlignLeft);
m_layout->addItem(funcKeys[12], row, 24, 1, 2, Qt::AlignLeft);
m_layout->addItem(funcKeys[13], row, 26, 1, 2, Qt::AlignLeft);
@@ -357,26 +376,26 @@
alphaKeys[46]->setKeycode(60);
alphaKeys[47]->setKeycode(61);
- funcKeys[6]->setKeycode(XK_Control_L, false);
- funcKeys[6]->setText("CTL");
- funcKeys[7]->setKeycode(XK_Meta_L, false);
- funcKeys[7]->setText("META");
- funcKeys[8]->setKeycode(XK_Alt_L, false);
- funcKeys[8]->setText("ALT");
+ funcKeys[CTLKEY]->setKeycode(XK_Control_L, false);
+ funcKeys[CTLKEY]->setText("CTL");
+ funcKeys[META_L_KEY]->setKeycode(XK_Meta_L, false);
+ funcKeys[META_L_KEY]->setText("META");
+ funcKeys[ALT_L_KEY]->setKeycode(XK_Alt_L, false);
+ funcKeys[ALT_L_KEY]->setText("ALT");
funcKeys[9]->setKeycode(XK_space, true);
- funcKeys[10]->setKeycode(XK_ISO_Level3_Shift, false);
- funcKeys[10]->setText("ALT GR");
- funcKeys[11]->setKeycode(XK_Meta_L, false);
- funcKeys[11]->setText("META");
+ funcKeys[ALTGRKEY]->setKeycode(XK_ISO_Level3_Shift, false);
+ funcKeys[ALTGRKEY]->setText("ALT GR");
+ funcKeys[META_R_KEY]->setKeycode(XK_Meta_L, false);
+ funcKeys[META_R_KEY]->setText("META");
funcKeys[12]->setKeycode(XK_Menu, true);
funcKeys[12]->setText("MENU");
funcKeys[13]->setKeycode(XK_Control_L, false);
funcKeys[13]->setText("CTL");
- QObject::connect(funcKeys[4], SIGNAL( clicked() ), this, SLOT( switchLevel() ) );
- QObject::connect(funcKeys[5], SIGNAL( clicked() ), this, SLOT( switchLevel() ) );
- QObject::connect(funcKeys[3], SIGNAL( clicked() ), this, SLOT( switchCaps() ) );
- QObject::connect(funcKeys[10], SIGNAL( clicked() ), this, SLOT( switchAlternative() ) );
+ QObject::connect(funcKeys[SHIFT_L_KEY], SIGNAL( clicked() ), this, SLOT( switchLevel() ) );
+ QObject::connect(funcKeys[SHIFT_R_KEY], SIGNAL( clicked() ), this, SLOT( switchLevel() ) );
+ QObject::connect(funcKeys[CAPSKEY], SIGNAL( clicked() ), this, SLOT( switchCaps() ) );
+ QObject::connect(funcKeys[ALTGRKEY], SIGNAL( clicked() ), this, SLOT( switchAlternative() ) );
}
@@ -397,8 +416,8 @@
else {
isLevel2 = false;
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_Shift_L));
- funcKeys[4]->toggleOff();
- funcKeys[5]->toggleOff();
+ funcKeys[SHIFT_L_KEY]->toggleOff();
+ funcKeys[SHIFT_R_KEY]->toggleOff();
}
int i = 0;
while ( i < 48 ) {
@@ -414,7 +433,7 @@
else {
isAlternative = false;
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_ISO_Level3_Shift));
- funcKeys[10]->toggleOff();
+ funcKeys[ALTGRKEY]->toggleOff();
}
int i = 0;
while ( i < 48 ) {
@@ -440,8 +459,8 @@
void PlasmaboardWidget::clearAnything(){
if ( isLocked ) {
switchCaps();
- funcKeys[3]->sendKeycodePress();
- funcKeys[3]->sendKeycodeRelease();
+ funcKeys[CAPSKEY]->sendKeycodePress();
+ funcKeys[CAPSKEY]->sendKeycodeRelease();
}
clear();
}
@@ -450,14 +469,14 @@
bool change = false;
if(isLevel2){
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_Shift_L));
- funcKeys[4]->toggleOff();
- funcKeys[5]->toggleOff();
+ funcKeys[SHIFT_L_KEY]->toggleOff();
+ funcKeys[SHIFT_R_KEY]->toggleOff();
isLevel2 = false;
change = true;
}
if(isAlternative){
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_ISO_Level3_Shift));
- funcKeys[10]->toggleOff();
+ funcKeys[ALTGRKEY]->toggleOff();
isAlternative = false;
change = true;
}
@@ -471,13 +490,13 @@
}
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_Control_L));
- funcKeys[6]->toggleOff();
+ funcKeys[CTLKEY]->toggleOff();
funcKeys[13]->toggleOff();
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_Meta_L));
- funcKeys[7]->toggleOff();
- funcKeys[11]->toggleOff();
+ funcKeys[META_L_KEY]->toggleOff();
+ funcKeys[META_R_KEY]->toggleOff();
Helpers::fakeKeyRelease(Helpers::keysymToKeycode(XK_Meta_L));
- funcKeys[8]->toggleOff();
+ funcKeys[ALT_L_KEY]->toggleOff();
}
--- trunk/playground/base/plasma/applets/plasmaboard/widget.h #959465:959466
@@ -49,7 +49,6 @@
void paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget*);
- void init();
void initBasicKeyboard(int offset=0);
void initExtendedKeyboard();
void resetKeyboard();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic