Skip to content

Commit

Permalink
Updated several functions
Browse files Browse the repository at this point in the history 
-Horizontal arranged stack page
-Support keyboard input
-new info page
-better skin
  • Loading branch information
@Linloir
Linloir committed Oct 12, 2021
1 parent 7a34e97 commit 8d9eafb
Show file tree
Hide file tree
Showing 15 changed files with 373 additions and 26 deletions.
8 changes: 8 additions & 0 deletions Acrylic_Dialog.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,15 @@ HEADERS += \
FORMS += \
acrylic.ui

RC_ICONS = favicon.ico

# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target

DISTFILES +=

RESOURCES += \
htmlInfo.qrc \
icon.qrc
10 changes: 6 additions & 4 deletions Acrylic_Dialog.pro.user
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.15.2, 2021-10-12T11:23:00. -->
<!-- Written by QtCreator 4.15.2, 2021-10-12T21:28:21. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down Expand Up @@ -94,7 +94,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.1.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.1.2 MSVC2019 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt6.612.win64_msvc2019_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
Expand Down Expand Up @@ -294,12 +294,14 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:E:/Documents/Coding Repositories/Qt Default Repository/Acrylic_Dialog/Acrylic_Dialog.pro</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">E:/Documents/Coding Repositories/Qt Default Repository/Acrylic_Dialog/Acrylic_Dialog.pro</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.WorkingDirectory.default">E:/Documents/Coding Repositories/Qt Default Repository/build-Acrylic_Dialog-Desktop_Qt_6_1_2_MSVC2019_64bit-Release</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
Expand Down
140 changes: 140 additions & 0 deletions acrylic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Acrylic::Acrylic(QWidget *parent)
ui->setupUi(this);
ui->verticalLayout->setAlignment(Qt::AlignTop);
this->resize(_width, _height);
this->setWindowIcon(QIcon(":/icon/icon"));

/****************************************************************************/
/********************Things to do with the Acrylic Window********************/
Expand Down Expand Up @@ -135,6 +136,30 @@ Acrylic::Acrylic(QWidget *parent)
ui->opClear ->setClickedColor(QColor(30, 30, 30, 70));
ui->bckSpace->setClickedColor(QColor(30, 30, 30, 70));

//setButtonFont
ui->opAdd ->_setFont(QFont("Arita Sans Thin", 22));
ui->opSub ->_setFont(QFont("Arita Sans Thin", 22));
ui->opMulti ->_setFont(QFont("Arita Sans Thin", 19));
ui->opDiv ->_setFont(QFont("Arita Sans Thin", 12));
ui->opSqr ->_setFont(QFont("Microsoft YaHei Light", 12));
ui->opPow ->_setFont(QFont("Microsoft YaHei Light", 12));
ui->opMod ->_setFont(QFont("Microsoft YaHei Light", 12));
ui->opBrckL ->_setFont(QFont("Arita Sans Thin", 12));
ui->opBrckR ->_setFont(QFont("Arita Sans Thin", 12));
ui->opClear ->_setFont(QFont("Microsoft YaHei Light", 12));
ui->bckSpace->_setFont(QFont("Arita Sans Thin", 11));

ui->num0->_setFont(QFont("Microsoft YaHei", 13));
ui->num1->_setFont(QFont("Microsoft YaHei", 13));
ui->num2->_setFont(QFont("Microsoft YaHei", 13));
ui->num3->_setFont(QFont("Microsoft YaHei", 13));
ui->num4->_setFont(QFont("Microsoft YaHei", 13));
ui->num5->_setFont(QFont("Microsoft YaHei", 13));
ui->num6->_setFont(QFont("Microsoft YaHei", 13));
ui->num7->_setFont(QFont("Microsoft YaHei", 13));
ui->num8->_setFont(QFont("Microsoft YaHei", 13));
ui->num9->_setFont(QFont("Microsoft YaHei", 13));

//Connect the buttons with input
connect(ui->num0, &QPushButton::clicked, [=](){expr.insert('0'); RfrInput(); UpdStack();});
connect(ui->num1, &QPushButton::clicked, [=](){expr.insert('1'); RfrInput(); UpdStack();});
Expand Down Expand Up @@ -315,3 +340,118 @@ void Acrylic::windowMaximum(){
isMaximum = false;
}
}

void Acrylic::keyPressEvent(QKeyEvent *event){
switch(event->key()){
case Qt::Key_0:
expr.insert('0');
RfrInput();
UpdStack();
break;
case Qt::Key_1:
expr.insert('1');
RfrInput();
UpdStack();
break;
case Qt::Key_2:
expr.insert('2');
RfrInput();
UpdStack();
break;
case Qt::Key_3:
expr.insert('3');
RfrInput();
UpdStack();
break;
case Qt::Key_4:
expr.insert('4');
RfrInput();
UpdStack();
break;
case Qt::Key_5:
expr.insert('5');
RfrInput();
UpdStack();
break;
case Qt::Key_6:
expr.insert('6');
RfrInput();
UpdStack();
break;
case Qt::Key_7:
expr.insert('7');
RfrInput();
UpdStack();
break;
case Qt::Key_8:
expr.insert('8');
RfrInput();
UpdStack();
break;
case Qt::Key_9:
expr.insert('9');
RfrInput();
UpdStack();
break;
case Qt::Key_ParenLeft:
expr.insert('(');
RfrInput();
UpdStack();
break;
case Qt::Key_ParenRight:
expr.insert(')');
RfrInput();
UpdStack();
break;
case Qt::Key_Backspace:
expr.backSpace();
RfrInput();
UpdStack(true);
break;
case Qt::Key_Plus:
expr.insert('+');
RfrInput();
UpdStack();
break;
case Qt::Key_Minus:
expr.insert('-');
RfrInput();
UpdStack();
break;
case Qt::Key_Asterisk:
expr.insert('*');
RfrInput();
UpdStack();
break;
case Qt::Key_Slash:
expr.insert('/');
RfrInput();
UpdStack();
break;
case Qt::Key_Percent:
expr.insert('%');
RfrInput();
UpdStack();
break;
case Qt::Key_AsciiCircum:
expr.insert('^');
RfrInput();
UpdStack();
break;
case Qt::Key_C:
expr.clr();
RfrInput();
UpdStack(true);
break;
case Qt::Key_Equal:
case Qt::Key_Enter:
expr.insert('#');
UpdStack();
RfrInput();
RfrResult();
UpdHistory();
default:
//expr.insert(event->text().at(0).toLatin1());
break;
}
}
5 changes: 5 additions & 0 deletions acrylic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define ACRYLIC_H

#include <QDialog>
#include <QKeyEvent>
#include "WindowCompositionAttribute.h"
#include "additiontabwidget.h"
#include "ConvertFunc.h"
Expand All @@ -17,11 +18,15 @@ class Acrylic : public QDialog
public:
Acrylic(QWidget *parent = nullptr);
~Acrylic();

private:
void paintEvent(QPaintEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void leaveEvent(QEvent *event){this->setCursor(Qt::ArrowCursor); pressed = false; mouseState = 0;}
void keyPressEvent(QKeyEvent* event);
//void keyReleaseEvent(QKeyEvent* event);

private:

Expand Down
Loading

0 comments on commit 8d9eafb

Please sign in to comment.