diff --git a/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/Keyboard.exe b/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/Keyboard.exe index 29bf42887ead8e10bb2f2e17ddd44d463475e3c3..022e70a76f065b3d6d2ea8afbb3874c7aeb73485 100644 Binary files a/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/Keyboard.exe and b/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/Keyboard.exe differ diff --git a/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/keyboard.o b/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/keyboard.o index 3ea577df18eaf6371b4eed85b35477593474daad..223bc4a4097d17cf8e709647473e6eb3b9f819c1 100644 Binary files a/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/keyboard.o and b/build-Keyboard-Desktop_Qt_5_9_9_MinGW_32bit-Debug/debug/keyboard.o differ diff --git a/keyboard.cpp b/keyboard.cpp index f5d3d3487f1434269a68f5891dbfd312c0d606a7..64716e968d0e43e0434a6e5dc4cc0273bbd74436 100644 --- a/keyboard.cpp +++ b/keyboard.cpp @@ -6,7 +6,7 @@ Keyboard::Keyboard(QWidget *parent) : QWidget(parent) { - this->setStyleSheet("QWidget{background: #e0e0e0;}"); + this->setStyleSheet("QWidget{background: #d9d9d9;}"); this->setWindowFlags (Qt::FramelessWindowHint|Qt::BypassWindowManagerHint); this->setAttribute(Qt::WA_AlwaysStackOnTop); @@ -73,7 +73,7 @@ Keyboard::Keyboard(QWidget *parent) engMainLayout->addLayout(secondLayout); QHBoxLayout *thirdLayout = new QHBoxLayout(); - Button *buttonShift = new Button("shift",Key_Shift), + Button *buttonShift = new Button("shift",Key_Shift,"#eaeaea"), *buttonZ = new Button("Z",Key_Z), *buttonX = new Button("X",Key_X), *buttonC = new Button("C",Key_C), @@ -101,14 +101,14 @@ Keyboard::Keyboard(QWidget *parent) engMainLayout->addLayout(thirdLayout); QHBoxLayout *lastLayout = new QHBoxLayout(); - Button *buttonNum = new Button("123",Key_NumKeyboard), - *buttonEng = new Button("Eng",Key_Split), - *buttonCtrl = new Button("Ctrl",Key_Ctrl), + Button *buttonNum = new Button("123",Key_NumKeyboard,"#eaeaea"), + *buttonEng = new Button("Eng",Key_Split,"#eaeaea"), + *buttonCtrl = new Button("Ctrl",Key_Ctrl,"#eaeaea"), *buttonSpace = new Button(" ",Key_Space), - *buttonEmoji = new Button("符号",Key_Split), - *buttonLeft = new Button("<",Key_Less), - *buttonRight = new Button(">",Key_Greater), - *buttonSwitch = new Button("切换",Key_Split); + *buttonEmoji = new Button("符号",Key_Split,"#eaeaea"), + *buttonLeft = new Button("<",Key_Less,"#eaeaea"), + *buttonRight = new Button(">",Key_Greater,"#eaeaea"), + *buttonSwitch = new Button("切换",Key_Split,"#eaeaea"); lastLayout->addWidget(buttonNum,2); lastLayout->addWidget(buttonCtrl,2); lastLayout->addWidget(buttonEmoji,2); @@ -127,7 +127,7 @@ Keyboard::Keyboard(QWidget *parent) QHBoxLayout *numMainLayout=new QHBoxLayout(); QVBoxLayout *puncLayout=new QVBoxLayout(); QGridLayout *puncFirstLayout=new QGridLayout(); - Button *buttonTab=new Button("Tab",Key_Tab), + Button *buttonTab=new Button("Tab",Key_Tab,"#eaeaea"), *buttonExclam=new Button("!",Key_Exclam), *buttonAt=new Button("@",Key_At), *buttonNumberSign=new Button("#",Key_NumberSign), @@ -142,7 +142,7 @@ Keyboard::Keyboard(QWidget *parent) puncFirstLayout->addWidget(buttonDots,0,5); puncFirstLayout->addWidget(buttonAnd,0,6); - Button *buttonLastPage=new Button("<",Key_LastPage), + Button *buttonLastPage=new Button("<",Key_LastPage,"#eaeaea"), *buttonLeftParen=new Button("(",Key_LeftParen), *buttonRightParen=new Button(")",Key_RightParen), *buttonMinus=new Button("-",Key_Minus), @@ -157,7 +157,7 @@ Keyboard::Keyboard(QWidget *parent) puncFirstLayout->addWidget(buttonEqual,1,5); puncFirstLayout->addWidget(buttonAdd,1,6); - Button *buttonNextPage=new Button(">",Key_NextPage), + Button *buttonNextPage=new Button(">",Key_NextPage,"#eaeaea"), *buttonBackSlash=new Button("\\",Key_BackSlash), *buttonSemicolon=new Button(";",Key_Semicolon), *buttonColon=new Button(":",Key_Colon), @@ -176,11 +176,11 @@ Keyboard::Keyboard(QWidget *parent) puncLayout->addLayout(puncFirstLayout,3); QHBoxLayout *puncSecondLayout=new QHBoxLayout(); - Button *buttonABC=new Button("ABC",Key_EngKeyboard), - *buttonCtrl2=new Button("Ctrl",Key_Ctrl), - *buttonOmega=new Button("Ω",Key_Omega), - *buttonLeft2=new Button("<",Key_Less), - *buttonRight2=new Button(">",Key_Greater), + Button *buttonABC=new Button("ABC",Key_EngKeyboard,"#eaeaea"), + *buttonCtrl2=new Button("Ctrl",Key_Ctrl,"#eaeaea"), + *buttonOmega=new Button("Ω",Key_Omega,"#eaeaea"), + *buttonLeft2=new Button("<",Key_Less,"#eaeaea"), + *buttonRight2=new Button(">",Key_Greater,"#eaeaea"), *buttonSpace2=new Button("空格",Key_Space); puncSecondLayout->addWidget(buttonABC,1); puncSecondLayout->addWidget(buttonCtrl2,1); @@ -223,9 +223,9 @@ Keyboard::Keyboard(QWidget *parent) numMainLayout->addLayout(numFirstLayout,3); QVBoxLayout *funcLayout=new QVBoxLayout(); - Button *buttonBackSpace2=new Button("←",Key_Backspace), - *buttonSend2=new Button("Send",Key_Enter), - *buttonSwitch2=new Button("切换",Key_Split); + Button *buttonBackSpace2=new Button("←",Key_Backspace,"#eaeaea"), + *buttonSend2=new Button("Send",Key_Enter,"#eaeaea"), + *buttonSwitch2=new Button("切换",Key_Split,"#eaeaea"); funcLayout->addWidget(buttonBackSpace2,1); funcLayout->addWidget(buttonSend2,2); funcLayout->addWidget(buttonSwitch2,1); @@ -245,7 +245,7 @@ Keyboard::Keyboard(QWidget *parent) QWidget *topBar=new QWidget(this); QHBoxLayout *topBarLayout=new QHBoxLayout(); - Button *closeButton = new Button("×",Key_Close,"#e0e0e0",50,50); + Button *closeButton = new Button("×",Key_Close,"#d9d9d9",50,50); topBarLayout->addWidget(closeButton); topBarLayout->setAlignment(Qt::AlignRight); topBar->setLayout(topBarLayout);