SVN commit 950158 by ruberg:

Code refactoring. Updated README



 M  +4 -7      README  
 M  +13 -16    widget.cpp  
 M  +1 -2      widget.h  


--- trunk/playground/base/plasma/applets/plasmaboard/README #950157:950158
@@ -20,13 +20,10 @@
 KNOWN ISSUES
 
 - When pressing "Alt Gr" the symbols on the keyboard do not adapt. This is an issue with the underlying X-Function, which seems
-only to do mapping for the shift key correctly. No known solution yet. Despite of that AltGr works as expected
+only to do mapping for the shift key correctly. No known solution yet. Despite of that AltGr works as expected 
 
-- The keyboard cannot be resized vertically. This is probably an issue with Plasma::Extender
-
-- When dropped on desktop the keyboard cannot be resized. This is probably an issue with Plasma::Extender, too
-
-- When dropped on desktop and moved around, plasma crashes. Dito as above. 
-
 - When changing the xkb-modmap, plasmaboard does not adapt automatically. You need to force the relabeling of the keys. Press "Shift" for example
 
+- Backspace key does not work in eclipse. Don't know why. If you find other applications in which plasmaboard doesn't work as expected, please report
+
+- Caps lock does not work for some keys. Don't know why. Shift works.
\ No newline at end of file
--- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp #950157:950158
@@ -36,19 +36,15 @@
 
     setPreferredSize(500, 200);
     setMinimumSize(300,150);
-    setMaximumSize(3000,3000);
-    width = 500;
-    height = 200;
-
     setCacheMode(QGraphicsItem::DeviceCoordinateCache);
 
-	initPC105Layout();
-	initLatinKeymap();
-
+    width = 500;
+    height = 200;
 	isLevel2 = false;
 	isAlternative = false;
 	isLocked = false;
 
+	initBasicKeyboard();
 }
 
 
@@ -73,8 +69,9 @@
 
 }
 
-void PlasmaboardWidget::initPC105Layout(){
+void PlasmaboardWidget::initBasicKeyboard(){
 
+	// create objects
 	int i = 0;
 	while ( i < 15 ) {
 		funcKeys[i] = new FuncKey(this);
@@ -88,13 +85,9 @@
 		i++;
 	}
 
-	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() ) );
+	// create layout
 
 	int numberOfCols = 30;
-	int numberOfRows = 5;
 
 	QGraphicsGridLayout *layout = new QGraphicsGridLayout(this);
 
@@ -159,10 +152,8 @@
 
 	setLayout(layout);
 
-}
+	// set Keymap
 
-void PlasmaboardWidget::initLatinKeymap(){
-
 	alphaKeys[0]->setKeycode(49);
 	alphaKeys[1]->setKeycode(10);
 	alphaKeys[2]->setKeycode(11);
@@ -245,6 +236,12 @@
 	funcKeys[13]->setText("CTL");
 	funcKeys[14]->setKeycode(XK_Escape, true);
 	funcKeys[14]->setText("ESC");
+
+	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() ) );
+
 }
 
 void PlasmaboardWidget::paint(QPainter *p,
--- trunk/playground/base/plasma/applets/plasmaboard/widget.h #950157:950158
@@ -50,8 +50,7 @@
                 const QStyleOptionGraphicsItem *option,
                  QWidget*);
         void init();
-        void initPC105Layout();
-        void initLatinKeymap();
+        void initBasicKeyboard();
 
     public Q_SLOTS:
         void switchLevel();