[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 13:58:09
Message-ID: 1240754289.326639.32062.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 959543 by ruberg:

Added keypad to extended mode
Added space between groups of function keys




 M  +82 -16    widget.cpp  
 M  +1 -1      widget.h  


--- trunk/playground/base/plasma/applets/plasmaboard/widget.cpp #959542:959543
@@ -117,7 +117,7 @@
 
 	i = 0;
 	if( extendedKeys ) {
-		while ( i < 26 ) {
+		while ( i < 42 ) {
 			delete extKeys[i];
 			i++;
 		}
@@ -130,25 +130,37 @@
 	extendedKeys = true;
 
 	int i = 0;
-	while ( i < 26 ) {
+	while ( i < 42 ) {
 		extKeys[i] = new FuncKey(this);
 		QObject::connect(extKeys[i], SIGNAL( clicked() ), this, SLOT( clear() ) );
 		i++;
 	}
 
+	delete extKeys[ARROWTOPKEY];
+	delete extKeys[ARROWLEFTKEY];
+	delete extKeys[ARROWBOTTOMKEY];
+	delete extKeys[ARROWRIGHTKEY];
 	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++){
+	i = 1;
+	for(i = 1; i < 5; i++){
 		m_layout->addItem(extKeys[i], 0, (i*2)+1, 1, 2, Qt::AlignLeft);
 	}
-	for(i = 13; i < 16; i++){
+	for(i = 5; i < 9; i++){
+		m_layout->addItem(extKeys[i], 0, (i*2)+2, 1, 2, Qt::AlignLeft);
+	}
+	for(i = 9; i < 13; i++){
 		m_layout->addItem(extKeys[i], 0, (i*2)+3, 1, 2, Qt::AlignLeft);
 	}
 
+	for(i = 13; i < 16; i++){
+		m_layout->addItem(extKeys[i], 0, (i*2)+4, 1, 2, Qt::AlignLeft);
+	}
+
 	extKeys[0]->setKeycode(XK_Escape, true);
 	extKeys[0]->setText("ESC");
 	extKeys[1]->setKeycode(XK_F1, true);
@@ -222,12 +234,70 @@
 	extKeys[PGDOWNKEY]->setKeycode(XK_Page_Down, true);
 	extKeys[PGDOWNKEY]->setText("PgDw");
 
+	col+=3;
 
-	m_layout->setColumnPreferredWidth(30,width/30);
-	m_layout->setColumnPreferredWidth(31,width/30);
-	m_layout->setColumnPreferredWidth(32,width/30);
-	m_layout->setColumnPreferredWidth(33,width/30);
-	m_layout->setColumnPreferredWidth(34,width/30);
+	m_layout->addItem(extKeys[26], 2, col, 1, 2);
+	extKeys[26]->setKeycode(XK_KP_7, true);
+	extKeys[26]->setText("7");
+	m_layout->addItem(extKeys[27], 3, col, 1, 2);
+	extKeys[27]->setKeycode(XK_KP_4, true);
+	extKeys[27]->setText("4");
+	m_layout->addItem(extKeys[28], 4, col, 1, 2);
+	extKeys[28]->setKeycode(XK_KP_1, true);
+	extKeys[28]->setText("1");
+	m_layout->addItem(extKeys[29], 5, col, 1, 4);
+	extKeys[29]->setKeycode(XK_KP_0, true);
+	extKeys[29]->setText("0");
+
+	col+=2;
+
+	m_layout->addItem(extKeys[30], 1, col, 1, 2);
+	extKeys[30]->setKeycode(XK_KP_Divide, true);
+	extKeys[30]->setText("/");
+	m_layout->addItem(extKeys[31], 2, col, 1, 2);
+	extKeys[31]->setKeycode(XK_KP_8, true);
+	extKeys[31]->setText("8");
+	m_layout->addItem(extKeys[32], 3, col, 1, 2);
+	extKeys[32]->setKeycode(XK_KP_5, true);
+	extKeys[32]->setText("5");
+	m_layout->addItem(extKeys[33], 4, col, 1, 2);
+	extKeys[33]->setKeycode(XK_KP_2, true);
+	extKeys[33]->setText("2");
+
+	col+=2;
+
+	m_layout->addItem(extKeys[34], 1, col, 1, 2);
+	extKeys[34]->setKeycode(XK_KP_Multiply, true);
+	extKeys[34]->setText("*");
+	m_layout->addItem(extKeys[35], 2, col, 1, 2);
+	extKeys[35]->setKeycode(XK_KP_9, true);
+	extKeys[35]->setText("9");
+	m_layout->addItem(extKeys[36], 3, col, 1, 2);
+	extKeys[36]->setKeycode(XK_KP_6, true);
+	extKeys[36]->setText("6");
+	m_layout->addItem(extKeys[37], 4, col, 1, 2);
+	extKeys[37]->setKeycode(XK_KP_3, true);
+	extKeys[37]->setText("3");
+	m_layout->addItem(extKeys[38], 5, col, 1, 2);
+	extKeys[38]->setKeycode(XK_KP_Separator, true);
+	extKeys[38]->setText(".");
+
+	col+=2;
+
+	m_layout->addItem(extKeys[39], 1, col, 1, 2);
+	extKeys[39]->setKeycode(XK_KP_Subtract, true);
+	extKeys[39]->setText("-");
+	m_layout->addItem(extKeys[40], 2, col, 2, 2);
+	extKeys[40]->setKeycode(XK_KP_Add, true);
+	extKeys[40]->setText("+");
+	m_layout->addItem(extKeys[41], 4, col, 2, 2);
+	extKeys[41]->setKeycode(XK_KP_Enter, true);
+	extKeys[41]->setText("Enter");
+
+
+	for(int i = 30; i < 44; i++){
+		m_layout->setColumnPreferredWidth(i,width/30);
+	}
 }
 
 void PlasmaboardWidget::initBasicKeyboard(int offset){
@@ -310,14 +380,10 @@
 		m_layout->setColumnPreferredWidth(i,width/numberOfCols);
 	}
 
+	for(int i = 30; i < 44; i++){
+		m_layout->setColumnPreferredWidth(i, 0);
+	}
 
-	m_layout->setColumnPreferredWidth(30,0);
-	m_layout->setColumnPreferredWidth(31,0);
-	m_layout->setColumnPreferredWidth(32,0);
-	m_layout->setColumnPreferredWidth(33,0);
-	m_layout->setColumnPreferredWidth(34,0);
-
-
 	m_layout->setSpacing(0);
 	m_layout->setContentsMargins(0,0,0,0);
 
--- trunk/playground/base/plasma/applets/plasmaboard/widget.h #959542:959543
@@ -64,7 +64,7 @@
 	private:
 		AlphaNumKey *alphaKeys[48]; // normal keys labeled with symbols like a, b, c
 		FuncKey *funcKeys[14]; // functional keys like shift, backspace, enter
-		FuncKey *extKeys[26]; // keys only shown in the extended layout as F1, F2,..
+		FuncKey *extKeys[42]; // keys only shown in the extended layout as F1, F2,..
 		bool isLevel2;
 		bool isAlternative;
 		bool isLocked;
[prev in list] [next in list] [prev in thread] [next in thread]