[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace/amourphiouskb] kcontrol/keyboard: code cleanup changes
From: shivam makkar <amourphious1992 () gmail ! com>
Date: 2012-10-04 13:47:54
Message-ID: 20121004134754.73ED2A605D () git ! kde ! org
[Download RAW message or body]
Git commit 6870cd8faff75bacd5f0f7dffcc8254e47e83fb4 by shivam makkar.
Committed on 04/10/2012 at 15:47.
Pushed by makkar into branch 'amourphiouskb'.
code cleanup changes
M +35 -23 kcontrol/keyboard/kbpreviewframe.cpp
M +4 -4 kcontrol/keyboard/kbpreviewframe.h
M +1 -1 kcontrol/keyboard/kcm_add_layout_dialog.cpp
M +1 -1 kcontrol/keyboard/kcm_keyboard_widget.cpp
M +7 -6 kcontrol/keyboard/keyaliases.cpp
M +5 -6 kcontrol/keyboard/keyaliases.h
M +19 -18 kcontrol/keyboard/keyboardlayout.cpp
M +8 -12 kcontrol/keyboard/keyboardlayout.h
M +9 -10 kcontrol/keyboard/keyboardpainter.cpp
M +6 -8 kcontrol/keyboard/keyboardpainter.h
M +6 -4 kcontrol/keyboard/keys.cpp
M +2 -2 kcontrol/keyboard/keys.h
M +13 -4 kcontrol/keyboard/keysym.cpp
M +5 -4 kcontrol/keyboard/keysym.h
http://commits.kde.org/kde-workspace/6870cd8faff75bacd5f0f7dffcc8254e47e83fb4
diff --git a/kcontrol/keyboard/kbpreviewframe.cpp b/kcontrol/keyboard/kbpreviewframe.cpp
index f908704..6250200 100644
--- a/kcontrol/keyboard/kbpreviewframe.cpp
+++ b/kcontrol/keyboard/kbpreviewframe.cpp
@@ -18,7 +18,6 @@
#include "kbpreviewframe.h"
-
#include <QtGui/QPainter>
#include <QtGui/QFont>
@@ -92,7 +91,7 @@ void KbPreviewFrame::paintAERow(QPainter &painter,int &x,int &y){
void KbPreviewFrame::paintADRow(QPainter &painter,int &x,int&y){
const int gr1=0,gr2=1,gr3=2,gr4=3,sz=20,kszx=70,kszy=70;
- const int lv1x=15,lvl2x=40,lvly=10,shify=60;
+ const int lv1x=15,lvl2x=40,lvly=10;
const QString lev12color="#d4d4d4",lev34color="#FF3300";
const int noADk=12;
@@ -123,8 +122,18 @@ void KbPreviewFrame::paintADRow(QPainter &painter,int &x,int&y){
x+=kszx;
}
painter.drawRect(x,y,kszx,kszy);
- painter.drawText(x+sz,y+sz,i18n("|"));
- painter.drawText(x+sz,y+shify,i18n("\\"));
+ for(int j=0;j<kblayout.BKSL.klst.size();j++){
+ if(j==gr2)
+ painter.drawText(x+lv1x,y+lvly,sz,sz,Qt::AlignBottom,symbol.getkeyuni(kblayout.BKSL.klst.at(gr2)));
+ if(j==gr1)
+ painter.drawText(x+lv1x,y+lvl2x,sz,sz,Qt::AlignTop,symbol.getkeyuni(kblayout.BKSL.klst.at(gr1)));
+ painter.setPen(QColor(lev34color));
+ if(j==gr3)
+ painter.drawText(x+lvl2x,y+lvl2x,sz,sz,Qt::AlignTop,symbol.getkeyuni(kblayout.BKSL.klst.at(gr3)));
+ if(j==gr4)
+ painter.drawText(x+lvl2x,y+lvly,sz,sz,Qt::AlignTop,symbol.getkeyuni(kblayout.BKSL.klst.at(gr4)));
+ painter.setPen(QColor(lev12color));
+ }
}
void KbPreviewFrame::paintACRow(QPainter &painter,int &x,int &y){
@@ -310,14 +319,14 @@ void KbPreviewFrame::paintEvent(QPaintEvent *){
if(symbol.nill>=120){
painter.drawRect(strtx,strty,endx,endy);
const int midx=470,midy=240;
- painter.drawText(midx,midy,i18n("No preview found"));
+ painter.drawText(midx,midy,i18n("No Preview Found"));
}
}
-void KbPreviewFrame::getKeyboardLayout(QString country, QString layoutvariant){
+void KbPreviewFrame::generateKeyboardLayout(const QString& country, const QString& layoutvariant){
QString filename=kblayout.findSymbolbasedir();
filename.append(country);
@@ -331,23 +340,26 @@ void KbPreviewFrame::getKeyboardLayout(QString country, QString layoutvariant){
symstr=content.split("xkb_symbols ");
if(layoutvariant=="")
- kblayout.getLayout(symstr.at(1),country);
-
- for(int i=1;i<symstr.size();i++){
- QString h=symstr.at(i);
- int k=h.indexOf("\"");
- h=h.mid(k);
- k=h.indexOf("{");
- h=h.left(k);
- h=h.remove(" ");
- QString f="\"";
- f.append(layoutvariant);
- f.append("\"");
- f=f.remove(" ");
-
- if(h==f){
- kblayout.getLayout(symstr.at(i),country);
- break;
+ kblayout.generateLayout(symstr.at(1),country);
+
+ else
+ {
+ for(int i=1;i<symstr.size();i++){
+ QString h=symstr.at(i);
+ int k=h.indexOf("\"");
+ h=h.mid(k);
+ k=h.indexOf("{");
+ h=h.left(k);
+ h=h.remove(" ");
+ QString f="\"";
+ f.append(layoutvariant);
+ f.append("\"");
+ f=f.remove(" ");
+
+ if(h==f){
+ kblayout.generateLayout(symstr.at(i),country);
+ break;
+ }
}
}
}
diff --git a/kcontrol/keyboard/kbpreviewframe.h b/kcontrol/keyboard/kbpreviewframe.h
index 309eb64..48de28f 100644
--- a/kcontrol/keyboard/kbpreviewframe.h
+++ b/kcontrol/keyboard/kbpreviewframe.h
@@ -22,7 +22,7 @@
#include"keysym.h"
#include"keyaliases.h"
#include<QPainter>
-#include <QFrame>
+#include <QtGui/QFrame>
class KbPreviewFrame : public QFrame
{
@@ -35,13 +35,13 @@ private:
void paintABRow(QPainter &painter,int &x,int &y);
void paintBottomRow(QPainter &painter,int &x,int &y);
void paintFnKeys(QPainter &painter,int &x,int &y);
+ KeySym symbol;
+ Aliases alias;
public:
explicit KbPreviewFrame(QWidget *parent = 0);
void paintEvent(QPaintEvent *);
KeyboardLayout kblayout;
- KeySym symbol;
- Aliases alias;
- void getKeyboardLayout(QString country, QString layoutvariant);
+ void generateKeyboardLayout(const QString &country, const QString &layoutvariant);
};
diff --git a/kcontrol/keyboard/kcm_add_layout_dialog.cpp b/kcontrol/keyboard/kcm_add_layout_dialog.cpp
index f4c1cd7..0e30d07 100644
--- a/kcontrol/keyboard/kcm_add_layout_dialog.cpp
+++ b/kcontrol/keyboard/kcm_add_layout_dialog.cpp
@@ -160,7 +160,7 @@ void AddLayoutDialog::preview(){
//variant=getvariant(variant);
/*a.append(selectedLayout);*/
layoutprev=new KeyboardPainter();
- layoutprev->getKeyboardLayout(selectedLayout,variant);
+ layoutprev->generateKeyboardLayout(selectedLayout,variant);
layoutprev->exec();
layoutprev->setModal(true);
}
diff --git a/kcontrol/keyboard/kcm_keyboard_widget.cpp b/kcontrol/keyboard/kcm_keyboard_widget.cpp
index a5aeddc..18014db 100644
--- a/kcontrol/keyboard/kcm_keyboard_widget.cpp
+++ b/kcontrol/keyboard/kcm_keyboard_widget.cpp
@@ -377,7 +377,7 @@ void KCMKeyboardWidget::previewLayout(){
break;
}
}
- layoutprev->getKeyboardLayout(country,variant);
+ layoutprev->generateKeyboardLayout(country,variant);
layoutprev->exec();
layoutprev->setModal(true);
diff --git a/kcontrol/keyboard/keyaliases.cpp b/kcontrol/keyboard/keyaliases.cpp
index a924352..87cf624 100644
--- a/kcontrol/keyboard/keyaliases.cpp
+++ b/kcontrol/keyboard/keyaliases.cpp
@@ -17,11 +17,11 @@
*/
#include "keyaliases.h"
-#include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtGui/QMessageBox>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
+#include<QtCore/QString>
+#include<QtCore/QMap>
+#include<QtGui/QMessageBox>
+#include<QtCore/QFile>
+#include<QtCore/QDir>
#include <QtGui/QX11Info>
#include <X11/Xlib.h>
@@ -32,6 +32,7 @@
#include <fixx11h.h>
#include <config-workspace.h>
+
Aliases::Aliases()
{
QString filename=findaliasdir();
@@ -84,7 +85,7 @@ Aliases::Aliases()
}
-QString Aliases::getAlias(QString cname, QString name){
+QString Aliases::getAlias(const QString& cname, const QString& name){
QMessageBox q;
QString a=name;
if(cname=="ma"){
diff --git a/kcontrol/keyboard/keyaliases.h b/kcontrol/keyboard/keyaliases.h
index e7623ca..bd7abcf 100644
--- a/kcontrol/keyboard/keyaliases.h
+++ b/kcontrol/keyboard/keyaliases.h
@@ -17,19 +17,18 @@
*/
#ifndef ALIASES_H
#define ALIASES_H
-
-#include <QtCore/QMap>
+#include<QtCore/QMap>
class Aliases
{
- QMap<QString,QString>qwerty;
+private:
+ QMap<QString,QString>qwerty;
QMap<QString,QString>azerty;
QMap<QString,QString>qwertz;
-
+ QString findaliasdir();
public:
Aliases();
- QString findaliasdir();
- QString getAlias(QString type,QString name);
+ QString getAlias(const QString &type, const QString &name);
};
#endif // ALIASES_H
diff --git a/kcontrol/keyboard/keyboardlayout.cpp b/kcontrol/keyboard/keyboardlayout.cpp
index 9ce8852..e6f5893 100644
--- a/kcontrol/keyboard/keyboardlayout.cpp
+++ b/kcontrol/keyboard/keyboardlayout.cpp
@@ -18,29 +18,26 @@
#include "keyboardlayout.h"
-#include "keys.h"
+#include<QtCore/QList>
+#include"keys.h"
+#include<QtGui/QMessageBox>
+#include<QtCore/QFile>
+#include<QtCore/QDir>
-#include <QtCore/QList>
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-
-#include <QtGui/QMessageBox>
#include <QtGui/QX11Info>
-
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <X11/XKBlib.h>
#include <X11/extensions/XKBrules.h>
-
#include <fixx11h.h>
#include <config-workspace.h>
+
KeyboardLayout::KeyboardLayout()
{
}
-
-void KeyboardLayout::getLayout(QString a,QString cname){
+void KeyboardLayout::generateLayout(QString a,const QString& cname){
includeSymbol(a,cname);
int i=a.indexOf("name[Group1]=");
i+=13;
@@ -57,41 +54,45 @@ void KeyboardLayout::getLayout(QString a,QString cname){
Keys dum;
QString r,y;
for(int k=0;k<st.size();k++){
- dum.getKey(st.at(k));
+ dum.setKey(st.at(k));
if(dum.keyname.startsWith("Lat"))
dum.keyname=alias.getAlias(cname,dum.keyname);
if(dum.keyname=="TLDE"){
r=st.at(k);
- TLDE.getKey(r);
+ TLDE.setKey(r);
+ }
+ if(dum.keyname=="BKSL"){
+ r=st.at(k);
+ BKSL.setKey(r);
}
if(dum.keyname.contains("AE")){
QString ind=dum.keyname.right(2);
int index=ind.toInt();
r=st.at(k);
- AE[index-1].getKey(r);
+ AE[index-1].setKey(r);
}
if(dum.keyname.contains("AD")){
QString ind=dum.keyname.right(2);
int index=ind.toInt();
r=st.at(k);
- AD[index-1].getKey(r);
+ AD[index-1].setKey(r);
}
if(dum.keyname.contains("AC")){
QString ind=dum.keyname.right(2);
int index=ind.toInt();
r=st.at(k);
- AC[index-1].getKey(r);
+ AC[index-1].setKey(r);
}
if(dum.keyname.contains("AB")){
QString ind=dum.keyname.right(2);
int index=ind.toInt();
r=st.at(k);
- AB[index-1].getKey(r);
+ AB[index-1].setKey(r);
}
}
}
-void KeyboardLayout::includeSymbol(QString a,QString cname){
+void KeyboardLayout::includeSymbol(QString a,const QString& cname){
int k=a.indexOf("include");
a=a.mid(k);
QList<QString>tobeinclude;
@@ -132,7 +133,7 @@ void KeyboardLayout::includeSymbol(QString a,QString cname){
int pos = cur.indexOf("{");
cur=cur.left(pos);
if(cur.contains(incfile.at(1))){
- getLayout(symstrlist.at(u),cname);
+ generateLayout(symstrlist.at(u),cname);
break;
}
}
diff --git a/kcontrol/keyboard/keyboardlayout.h b/kcontrol/keyboard/keyboardlayout.h
index 029a4c2..9b56746 100644
--- a/kcontrol/keyboard/keyboardlayout.h
+++ b/kcontrol/keyboard/keyboardlayout.h
@@ -18,30 +18,26 @@
#ifndef KEYBOARDLAYOUT_H
#define KEYBOARDLAYOUT_H
-
#include"keys.h"
#include"keyaliases.h"
-
-#include <QtGui/QApplication>
-
+#include<QApplication>
class KeyboardLayout
{
- QString layoutName;
+ QString layoutName;
Aliases alias;
-
public:
+ KeyboardLayout();
+ Keys TLDE;
+ Keys BKSL;
Keys AE[12];
Keys AD[12];
Keys AC[11];
Keys AB[11];
- Keys TLDE;
-
- KeyboardLayout();
- void getLayout(QString a,QString cname);
+ void generateLayout(QString a, const QString &cname);
QString findSymbolbasedir();
- void includeSymbol(QString a,QString cname);
+ void includeSymbol(QString a, const QString &cname);
QString getLayoutName() const {
- return layoutName;
+ return layoutName;
}
};
#endif // KEYBOARDLAYOUT_H
diff --git a/kcontrol/keyboard/keyboardpainter.cpp b/kcontrol/keyboard/keyboardpainter.cpp
index 22e5f01..7355619 100644
--- a/kcontrol/keyboard/keyboardpainter.cpp
+++ b/kcontrol/keyboard/keyboardpainter.cpp
@@ -18,14 +18,13 @@
#include "keyboardpainter.h"
#include "ui_keyboardpainter.h"
-
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
+#include<QtGui/QHBoxLayout>
+#include<QtGui/QVBoxLayout>
KeyboardPainter::KeyboardPainter() :
+ ui(new Ui::keyboardpainter),
kbframe(new KbPreviewFrame(this)),
- exitButton(new QPushButton(tr("Close"),this)),
- ui(new Ui::keyboardpainter)
+ exitButton(new QPushButton(tr("Close"),this))
{
ui->setupUi(this);
kbframe->setFixedSize( 1030, 490 );
@@ -37,14 +36,14 @@ KeyboardPainter::KeyboardPainter() :
setWindowTitle(kbframe->kblayout.getLayoutName());
}
+void KeyboardPainter::generateKeyboardLayout(QString country, QString variant)
+{
+ kbframe->generateKeyboardLayout(country,variant);
+}
+
KeyboardPainter::~KeyboardPainter()
{
delete ui;
delete kbframe;
delete exitButton;
}
-
-void KeyboardPainter::getKeyboardLayout(QString country, QString variant)
-{
- kbframe->getKeyboardLayout(country,variant);
-}
diff --git a/kcontrol/keyboard/keyboardpainter.h b/kcontrol/keyboard/keyboardpainter.h
index f4a4be8..d9a5bb2 100644
--- a/kcontrol/keyboard/keyboardpainter.h
+++ b/kcontrol/keyboard/keyboardpainter.h
@@ -21,9 +21,9 @@
#define KEYBOARDPAINTER_H
#include <QtGui/QDialog>
-#include <QtGui/QPushButton>
+#include<QtGui/QPushButton>
-#include "kbpreviewframe.h"
+#include"kbpreviewframe.h"
namespace Ui {
class keyboardpainter;
@@ -32,18 +32,16 @@ class keyboardpainter;
class KeyboardPainter : public QDialog
{
Q_OBJECT
-
+
public:
explicit KeyboardPainter();
~KeyboardPainter();
-
- QString getVariant(QString variant,QString selectedLayout);
- void getKeyboardLayout(QString country, QString layoutvariant);
-
+ void generateKeyboardLayout(QString country, QString layoutvariant);
+
private:
+ Ui::keyboardpainter *ui;
KbPreviewFrame *kbframe;
QPushButton *exitButton;
- Ui::keyboardpainter *ui;
};
#endif // KEYBOARDPAINTER_H
diff --git a/kcontrol/keyboard/keys.cpp b/kcontrol/keyboard/keys.cpp
index 0587076..5f80a07 100644
--- a/kcontrol/keyboard/keys.cpp
+++ b/kcontrol/keyboard/keys.cpp
@@ -19,26 +19,28 @@
#include "keys.h"
#include<QApplication>
-#include<QStringList>
+#include<QtCore/QStringList>
Keys::Keys()
{
}
-void Keys::getKey(QString a){
+void Keys::setKey(QString a){
int i=a.indexOf("<");
i++;
keyname=a.mid(i,4);
- keyname.simplified();
+ keyname.remove(" ");
i=a.indexOf("[");
i++;
QString str=a.mid(i);
i=str.indexOf("]");
QString st=str.left(i);
- st=st.simplified();
+ st=st.remove(" ");
//QStringList klst;
klst=st.split(",");
for(int k=0;k<klst.size();k++){
QString du=klst.at(k);
du.remove(" ");
+ du.remove("\t");
+ du.remove("\n");
klst[k]=du;
}
}
diff --git a/kcontrol/keyboard/keys.h b/kcontrol/keyboard/keys.h
index a6d5d53..458a2c5 100644
--- a/kcontrol/keyboard/keys.h
+++ b/kcontrol/keyboard/keys.h
@@ -20,14 +20,14 @@
#ifndef KEYS_H
#define KEYS_H
#include<QApplication>
-#include<QList>
+#include<QtCore/QList>
class Keys
{
public:
Keys();
QString keyname;
QList<QString>klst;
- void getKey(QString a);
+ void setKey(QString a);
};
#endif // KEYS_H
diff --git a/kcontrol/keyboard/keysym.cpp b/kcontrol/keyboard/keysym.cpp
index c53b3cf..4e64ded 100644
--- a/kcontrol/keyboard/keysym.cpp
+++ b/kcontrol/keyboard/keysym.cpp
@@ -17,14 +17,19 @@
*/
#include "keysym.h"
-#include<QMessageBox>
-#include<QChar>
+#include<QtGui/QMessageBox>
+#include<QtCore/QChar>
KeySym::KeySym()
{
nill=0;
}
QString KeySym::getkeyuni(QString opton){
QString a;
+ QRegExp krx("^U+[0-9]");
+ if(opton.contains(krx)){
+ opton.remove("U");
+ opton.prepend("0x");
+ }
for(int i=0;i<8291;i++){
if(keystr[i]==opton){
a=QString(keyuni[i]);
@@ -36,6 +41,8 @@ QString KeySym::getkeyuni(QString opton){
}
QString KeySym::keystr[]={
+ "0x2019",
+ "0x0301",
"0",
"1",
"2",
@@ -8330,6 +8337,8 @@ QString KeySym::keystr[]={
};
QChar KeySym::keyuni[]={
+ 0x2019,
+ 0x0301,
0x30,
0x31,
0x32,
@@ -16621,6 +16630,6 @@ QChar KeySym::keyuni[]={
0x1000E1D,
0x1000E26,
0x1000309,
- '\'',
- '~'
+ 0x2019,
+ 0x0301
};
diff --git a/kcontrol/keyboard/keysym.h b/kcontrol/keyboard/keysym.h
index 0908470..d7e3902 100644
--- a/kcontrol/keyboard/keysym.h
+++ b/kcontrol/keyboard/keysym.h
@@ -19,15 +19,16 @@
#ifndef KEYSYM_H
#define KEYSYM_H
#include<QtGui>
-#include<QChar>
-#include<QString>
+#include<QtCore/QChar>
+#include<QtCore/QString>
class KeySym
{
+private:
+ static QString keystr[];
+ static QChar keyuni[];
public:
KeySym();
int nill;
- static QString keystr[];
- static QChar keyuni[];
QString getkeyuni(QString opton);
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic