[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-workspace/previewsoc13] kcontrol/keyboard/preview: fk key display string fixed
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2013-11-05 20:08:16
Message-ID: E1VdmvA-0004dI-V3 () scm ! kde ! org
[Download RAW message or body]

Git commit cc1d03c979cc110e19edacc17393795364163138 by shivam makkar.
Committed on 05/11/2013 at 20:07.
Pushed by makkar into branch 'previewsoc13'.

fk key display string fixed

M  +7    -1    kcontrol/keyboard/preview/kbpreviewframe.cpp
M  +1    -5    kcontrol/keyboard/preview/keyboardpainter.cpp

http://commits.kde.org/kde-workspace/cc1d03c979cc110e19edacc17393795364163138

diff --git a/kcontrol/keyboard/preview/kbpreviewframe.cpp b/kcontrol/keyboard/preview/kbpreviewframe.cpp
index 40359f9..2d7a11e 100644
--- a/kcontrol/keyboard/preview/kbpreviewframe.cpp
+++ b/kcontrol/keyboard/preview/kbpreviewframe.cpp
@@ -47,6 +47,7 @@ static const int xOffset[] = {10, 10, -15, -15 };
 static const int yOffset[] = {5, -20, 5, -20 };
 static const QColor color[] = { lev12color, lev12color, lev34color, lev34color };
 static const int keyLevel[3][4] = { { 1, 0, 2, 3}, { 1, 0, 4, 5}, { 1, 0, 6, 7} };
+static const QRegExp fkKey("^FK\\d+$");
 
 
 KbPreviewFrame::KbPreviewFrame(QWidget *parent) :
@@ -79,7 +80,7 @@ void KbPreviewFrame::drawKeySymbols(QPainter &painter, QPoint temp[], const GSha
     if(szx > szy)
         kbfont.setPointSize(szy/2 < 9 ? szy : 9);
     else
-        kbfont.setPointSize(szx/2 < 9 ? sz/2 : 9);
+        kbfont.setPointSize(szx/2 < 9 ? szx/2 : 9);
 
     painter.setFont(kbfont);
 
@@ -124,6 +125,11 @@ void KbPreviewFrame::drawKeySymbols(QPainter &painter, QPoint temp[], const GSha
     }
     else{
         painter.setPen(Qt::black);
+
+        if( name.contains(fkKey) ){
+            name.remove("K");
+        }
+
         painter.drawText(temp[0].x()+s.size(0)-10, temp[0].y()+3*s.size(1)/2, name);
 
         tip = name;
diff --git a/kcontrol/keyboard/preview/keyboardpainter.cpp b/kcontrol/keyboard/preview/keyboardpainter.cpp
index 0427102..bb696cf 100644
--- a/kcontrol/keyboard/preview/keyboardpainter.cpp
+++ b/kcontrol/keyboard/preview/keyboardpainter.cpp
@@ -35,7 +35,7 @@ KeyboardPainter::KeyboardPainter():
     exitButton(new QPushButton(i18n("Close"), this)),
     levelBox(new QComboBox(this))
 {
-    kbframe->setFixedSize(1100,490);
+    kbframe->setFixedSize(1100, 490);
     exitButton->setFixedSize( 120, 30 );
     levelBox->setFixedSize( 360, 30 );
 
@@ -61,7 +61,6 @@ void KeyboardPainter::generateKeyboardLayout(const QString& layout, const QStrin
     kbframe->generateKeyboardLayout(layout, variant, model);
     kbframe->setFixedSize(getWidth(),getHeight());
     kbDialog->setFixedSize(getWidth(),getWidth());
-    qDebug()<<kbframe->size()<<kbDialog->size();
     setWindowTitle(title);
 
     int level = kbframe->getLevel();
@@ -83,15 +82,12 @@ void KeyboardPainter::levelChanged(int l_id){
 
 int KeyboardPainter::getHeight(){
    int height = kbframe->getHeight();
-   qDebug()<<"scaleFactor"<<kbframe->getScaleFactor()<<"height"<<height;
    height = kbframe->getScaleFactor() * height + 50;
    return height;
 }
 
 int KeyboardPainter::getWidth(){
    int width = kbframe->getWidth();
-
-   qDebug()<<"scaleFactor"<<kbframe->getScaleFactor()<<"width"<<width;
    width = kbframe->getScaleFactor() * width + 20;
    return width;
 }
[prev in list] [next in list] [prev in thread] [next in thread]