TianZD
/
NumKeyBoard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

modify:优化

master
TianZD 2 weeks ago
parent
927d1f68a2
commit
e5d446b3aa
5 changed files with 203 additions and 241 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      NumKeyBoard.pri
  2. 12
      NumKeyBoard_global.h
  3. 377
      numkeydia.cpp
  4. 49
      numkeydia.h
  5. 2
      numkeydia.ui

4
NumKeyBoard.pri
View File

@ -1,7 +1,11 @@
INCLUDEPATH += $$PWD/ INCLUDEPATH += $$PWD/
DEFINES += NUMKEYBOARD_STATIC
HEADERS += $$PWD/numkeydia.h HEADERS += $$PWD/numkeydia.h
SOURCES += $$PWD/numkeydia.cpp SOURCES += $$PWD/numkeydia.cpp
FORMS += $$PWD/numkeydia.ui FORMS += $$PWD/numkeydia.ui
RESOURCES += $$PWD/NumKeyBoard.qrc

12
NumKeyBoard_global.h
View File

@ -3,10 +3,16 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#if defined(NUMKEYBOARD_LIBRARY) // 如果定义了 NUMKEYBOARD_STATIC，则宏为空（适用于直接引入源码编译）
#define NUMKEYBOARD_EXPORT Q_DECL_EXPORT #if defined(NUMKEYBOARD_STATIC)
# define NUMKEYBOARD_EXPORT
#else #else
#define NUMKEYBOARD_EXPORT Q_DECL_IMPORT // 如果没定义 STATIC，则在“写库”和“用库”之间切换
# if defined(NUMKEYBOARD_LIBRARY)
# define NUMKEYBOARD_EXPORT Q_DECL_EXPORT
# else
# define NUMKEYBOARD_EXPORT Q_DECL_IMPORT
# endif
#endif #endif
#endif // NUMKEYBOARD_GLOBAL_H #endif // NUMKEYBOARD_GLOBAL_H

377
numkeydia.cpp
View File

@ -1,263 +1,240 @@
#include "numkeydia.h" #include "numkeydia.h"
#include "ui_numkeydia.h" #include "ui_numkeydia.h"
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPushButton> #include <QPushButton>
#include <QShortcut> #include <QShortcut>
#include <QTextStream> #include <QTextStream>
#include <QtGlobal>
namespace // --- 私有类定义 ---
{ class NumKeyDiaPrivate {
void loadKeyboardStyleSheet(QWidget *widget) Q_DECLARE_PUBLIC(NumKeyDia)
{
if(!widget) public:
{ NumKeyDiaPrivate(NumKeyDia *q) : q_ptr(q) {}
return;
} // 成员变量移入 D-pointer
Ui::NumKeyDia *ui = nullptr;
QString value;
QPoint m_point;
bool m_firstInputFlag = true;
enum class InputPage { NumberPage, SymbolPage };
InputPage m_inputPage = InputPage::NumberPage;
// 辅助函数
void setInputPage(InputPage page);
void refreshInputButtons();
void configureInputButton(QPushButton *button, const QString &label,
const QString &value, bool enabled, bool isModeSwitch = false);
void loadStyleSheet();
private:
NumKeyDia *q_ptr; // 反向指针
};
// --- 私有类逻辑实现 ---
void NumKeyDiaPrivate::loadStyleSheet() {
QFile file(QStringLiteral(":/commonWidget.qss")); QFile file(QStringLiteral(":/commonWidget.qss"));
if(!file.open(QFile::ReadOnly | QFile::Text)) if (file.open(QFile::ReadOnly | QFile::Text)) {
{ QTextStream stream(&file);
qDebug() << QStringLiteral("Unable to load keyboard stylesheet"); q_ptr->setStyleSheet(stream.readAll());
return;
} }
}
QTextStream stream(&file); void NumKeyDiaPrivate::setInputPage(InputPage page) {
widget->setStyleSheet(stream.readAll()); m_inputPage = page;
refreshInputButtons();
} }
void NumKeyDiaPrivate::refreshInputButtons() {
if (m_inputPage == InputPage::NumberPage) {
configureInputButton(ui->btn_1, "1", "1", true);
configureInputButton(ui->btn_2, "2", "2", true);
configureInputButton(ui->btn_3, "3", "3", true);
configureInputButton(ui->btn_4, "4", "4", true);
configureInputButton(ui->btn_5, "5", "5", true);
configureInputButton(ui->btn_6, "6", "6", true);
configureInputButton(ui->btn_7, "7", "7", true);
configureInputButton(ui->btn_8, "8", "8", true);
configureInputButton(ui->btn_9, "9", "9", true);
configureInputButton(ui->btn_sub, "#+=", "", true, true);
configureInputButton(ui->btn_0, "0", "0", true);
configureInputButton(ui->pushButton_dot, ".", ".", true);
} else {
configureInputButton(ui->btn_1, "/", "/", true);
configureInputButton(ui->btn_2, "-", "-", true);
configureInputButton(ui->btn_3, ":", ":", true);
QString deg = QChar(0x00B0);
configureInputButton(ui->btn_4, deg, deg, true);
configureInputButton(ui->btn_5, "'", "'", true);
configureInputButton(ui->btn_6, "\"", "\"", true);
configureInputButton(ui->btn_7, ".", ".", true);
configureInputButton(ui->btn_8, "_", "_", true);
configureInputButton(ui->btn_9, "@", "@", true);
configureInputButton(ui->btn_sub, "123", "", true, true);
configureInputButton(ui->btn_0, "+", "+", true);
configureInputButton(ui->pushButton_dot, ",", ",", true);
}
}
void NumKeyDiaPrivate::configureInputButton(QPushButton *button, const QString &label,
const QString &value, bool enabled, bool isModeSwitch) {
if (!button) return;
button->setText(label);
button->setEnabled(enabled);
button->setProperty("inputValue", value);
button->setProperty("isModeSwitch", isModeSwitch);
} }
// --- 公共类实现 ---
NumKeyDia *NumKeyDia::singleton = nullptr; NumKeyDia *NumKeyDia::singleton = nullptr;
NumKeyDia::NumKeyDia(QWidget *parent) : NumKeyDia::NumKeyDia(QWidget *parent)
QDialog(parent), : QDialog(parent)
ui(new Ui::NumKeyDia) , d_ptr(new NumKeyDiaPrivate(this)) // 初始化 d_ptr
{ {
loadKeyboardStyleSheet(this); Q_D(NumKeyDia);
if(singleton != nullptr)
{ if (!singleton) singleton = this;
return;
} Q_INIT_RESOURCE(NumKeyBoard);
singleton = this;
ui->setupUi(this); d->ui = new Ui::NumKeyDia;
this->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); d->ui->setupUi(this);
ui->lineEdit_input->setFocusPolicy(Qt::StrongFocus); d->loadStyleSheet();
auto _btnInputList = ui->widget_input->findChildren<QPushButton *>();
foreach (auto &i, _btnInputList) setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
{ d->ui->lineEdit_input->setFocusPolicy(Qt::StrongFocus);
connect(i, &QPushButton::clicked, this, &NumKeyDia::btn_input_clicked);
i->setFocusPolicy(Qt::NoFocus); auto btnList = d->ui->widget_input->findChildren<QPushButton *>();
for (auto *btn : btnList) {
connect(btn, &QPushButton::clicked, this, &NumKeyDia::btn_input_clicked);
btn->setFocusPolicy(Qt::NoFocus);
} }
auto *returnShortcut = new QShortcut(QKeySequence(Qt::Key_Return), this); auto *okShortcut = new QShortcut(QKeySequence(Qt::Key_Return), this);
connect(returnShortcut, &QShortcut::activated, this, &NumKeyDia::on_btn_ok_clicked); connect(okShortcut, &QShortcut::activated, this, &NumKeyDia::on_btn_ok_clicked);
auto *enterShortcut = new QShortcut(QKeySequence(Qt::Key_Enter), this); d->ui->toolButton_ico->installEventFilter(this);
connect(enterShortcut, &QShortcut::activated, this, &NumKeyDia::on_btn_ok_clicked); d->ui->label_appInfo->installEventFilter(this);
d->ui->btn_clear->setText(QStringLiteral("<"));
ui->toolButton_ico->installEventFilter(this); d->setInputPage(NumKeyDiaPrivate::InputPage::NumberPage);
ui->label_appInfo->installEventFilter(this);
ui->btn_clear->setText(QStringLiteral("<"));
setInputPage(InputPage::NumberPage);
} }
NumKeyDia::~NumKeyDia() NumKeyDia::~NumKeyDia() {
{ if (singleton == this) singleton = nullptr;
if(singleton == this) // QScopedPointer 会自动删除 d_ptr，但 Ui 需手动销毁（如果没设置 parent）
{ Q_D(NumKeyDia);
singleton = nullptr; delete d->ui;
}
delete ui;
} }
bool NumKeyDia::eventFilter(QObject *, QEvent *event) NumKeyDia* NumKeyDia::instance() {
{ if(!singleton)
if(event->type() == QEvent::MouseButtonPress) singleton = new NumKeyDia;
{ return singleton;
}
bool NumKeyDia::eventFilter(QObject *, QEvent *event) {
Q_D(NumKeyDia);
if (event->type() == QEvent::MouseButtonPress) {
auto *mouseEvent = static_cast<QMouseEvent *>(event); auto *mouseEvent = static_cast<QMouseEvent *>(event);
m_point = mouseEvent->globalPos() - frameGeometry().topLeft(); d->m_point = mouseEvent->globalPos() - frameGeometry().topLeft();
} } else if (event->type() == QEvent::MouseMove) {
else if(event->type() == QEvent::MouseMove)
{
auto *mouseEvent = static_cast<QMouseEvent *>(event); auto *mouseEvent = static_cast<QMouseEvent *>(event);
move(mouseEvent->globalPos() - m_point); move(mouseEvent->globalPos() - d->m_point);
} }
return false; return false;
} }
void NumKeyDia::setValue(const QString &value) void NumKeyDia::setValue(const QString &value) {
{ Q_D(NumKeyDia);
this->value = value; d->value = value;
setInputPage(InputPage::NumberPage); d->setInputPage(NumKeyDiaPrivate::InputPage::NumberPage);
ui->lineEdit_input->setFocus(); d->ui->lineEdit_input->setFocus();
ui->lineEdit_input->setText(value); d->ui->lineEdit_input->setText(value);
ui->lineEdit_input->setCursorPosition(ui->lineEdit_input->text().size()); d->ui->lineEdit_input->setCursorPosition(d->ui->lineEdit_input->text().size());
d->m_firstInputFlag = true;
m_firstInputFlag = true;
} }
QString &NumKeyDia::getValue() QString &NumKeyDia::getValue() {
{ Q_D(NumKeyDia);
return value; return d->value;
} }
void NumKeyDia::on_btn_ok_clicked() void NumKeyDia::on_btn_ok_clicked() {
{ Q_D(NumKeyDia);
QString _res = ui->lineEdit_input->text(); QString res = d->ui->lineEdit_input->text();
if(_res.isEmpty()) d->value = res.isEmpty() ? "0" : res;
{
_res = QStringLiteral("0");
}
value = _res;
closeKeyBoard(); closeKeyBoard();
} }
void NumKeyDia::on_btn_cancel_clicked() void NumKeyDia::on_btn_cancel_clicked() {
{
closeKeyBoard(); closeKeyBoard();
} }
void NumKeyDia::on_btn_clear_clicked() void NumKeyDia::on_btn_clear_clicked() {
{ Q_D(NumKeyDia);
m_firstInputFlag = false; d->m_firstInputFlag = false;
const int currentPosition = ui->lineEdit_input->cursorPosition(); int pos = d->ui->lineEdit_input->cursorPosition();
ui->lineEdit_input->setCursorPosition(qMax(0, currentPosition - 1)); d->ui->lineEdit_input->setCursorPosition(qMax(0, pos - 1));
ui->lineEdit_input->setFocus(); d->ui->lineEdit_input->setFocus();
} }
void NumKeyDia::on_btn_back_clicked() void NumKeyDia::on_btn_back_clicked() {
{ Q_D(NumKeyDia);
m_firstInputFlag = false; d->m_firstInputFlag = false;
int index = d->ui->lineEdit_input->cursorPosition();
int _index = ui->lineEdit_input->cursorPosition(); QString text = d->ui->lineEdit_input->text();
QString _currentText = ui->lineEdit_input->text();
if(_currentText.isEmpty()) if (index > 0) {
{ text.remove(index - 1, 1);
ui->lineEdit_input->setFocus(); d->ui->lineEdit_input->setText(text);
d->ui->lineEdit_input->setCursorPosition(index - 1);
} }
d->ui->lineEdit_input->setFocus();
if(_index != 0)
{
_currentText.remove(_index - 1, 1);
ui->lineEdit_input->setText(_currentText);
}
ui->lineEdit_input->setFocus();
ui->lineEdit_input->setCursorPosition(qMax(0, _index - 1));
} }
void NumKeyDia::btn_input_clicked() void NumKeyDia::btn_input_clicked() {
{ Q_D(NumKeyDia);
auto *_btnClicked = qobject_cast<QPushButton *>(sender()); auto *btn = qobject_cast<QPushButton *>(sender());
if(!_btnClicked) if (!btn) return;
{
return;
}
if(_btnClicked->property("isModeSwitch").toBool()) if (btn->property("isModeSwitch").toBool()) {
{ auto nextPage = (d->m_inputPage == NumKeyDiaPrivate::InputPage::NumberPage)
const auto nextPage = (m_inputPage == InputPage::NumberPage) ? NumKeyDiaPrivate::InputPage::SymbolPage
? InputPage::SymbolPage : NumKeyDiaPrivate::InputPage::NumberPage;
: InputPage::NumberPage; d->setInputPage(nextPage);
setInputPage(nextPage); d->ui->lineEdit_input->setFocus();
ui->lineEdit_input->setFocus();
return; return;
} }
if(m_firstInputFlag) if (d->m_firstInputFlag) {
{ d->ui->lineEdit_input->clear();
ui->lineEdit_input->clear(); d->m_firstInputFlag = false;
m_firstInputFlag = false;
} }
const QString _inputValue = _btnClicked->property("inputValue").toString(); QString input = btn->property("inputValue").toString();
if(_inputValue.isEmpty()) if (input.isEmpty()) return;
{
ui->lineEdit_input->setFocus();
return;
}
int _index = ui->lineEdit_input->cursorPosition(); int index = d->ui->lineEdit_input->cursorPosition();
QString _currentText = ui->lineEdit_input->text(); QString text = d->ui->lineEdit_input->text();
text.insert(index, input);
_currentText.insert(_index, _inputValue); d->ui->lineEdit_input->setText(text);
ui->lineEdit_input->setText(_currentText); d->ui->lineEdit_input->setFocus();
ui->lineEdit_input->setFocus(); d->ui->lineEdit_input->setCursorPosition(index + input.size());
ui->lineEdit_input->setCursorPosition(_index + _inputValue.size());
} }
void NumKeyDia::closeKeyBoard() void NumKeyDia::closeKeyBoard() {
{
this->close(); this->close();
} }
void NumKeyDia::setInputPage(InputPage page) namespace KeyBoard {
{ NumKeyDia *app() {
m_inputPage = page; return NumKeyDia::instance();
refreshInputButtons();
}
void NumKeyDia::refreshInputButtons()
{
if(m_inputPage == InputPage::NumberPage)
{
configureInputButton(ui->btn_1, QStringLiteral("1"), QStringLiteral("1"), true);
configureInputButton(ui->btn_2, QStringLiteral("2"), QStringLiteral("2"), true);
configureInputButton(ui->btn_3, QStringLiteral("3"), QStringLiteral("3"), true);
configureInputButton(ui->btn_4, QStringLiteral("4"), QStringLiteral("4"), true);
configureInputButton(ui->btn_5, QStringLiteral("5"), QStringLiteral("5"), true);
configureInputButton(ui->btn_6, QStringLiteral("6"), QStringLiteral("6"), true);
configureInputButton(ui->btn_7, QStringLiteral("7"), QStringLiteral("7"), true);
configureInputButton(ui->btn_8, QStringLiteral("8"), QStringLiteral("8"), true);
configureInputButton(ui->btn_9, QStringLiteral("9"), QStringLiteral("9"), true);
configureInputButton(ui->btn_sub, QStringLiteral("#+="), QString(), true, true);
configureInputButton(ui->btn_0, QStringLiteral("0"), QStringLiteral("0"), true);
configureInputButton(ui->pushButton_dot, QStringLiteral("."), QStringLiteral("."), true);
return;
}
configureInputButton(ui->btn_1, QStringLiteral("/"), QStringLiteral("/"), true);
configureInputButton(ui->btn_2, QStringLiteral("-"), QStringLiteral("-"), true);
configureInputButton(ui->btn_3, QStringLiteral(":"), QStringLiteral(":"), true);
const QString degreeSymbol(QChar(0x00B0));
configureInputButton(ui->btn_4, degreeSymbol, degreeSymbol, true);
configureInputButton(ui->btn_5, QStringLiteral("'"), QStringLiteral("'"), true);
configureInputButton(ui->btn_6, QStringLiteral("\""), QStringLiteral("\""), true);
configureInputButton(ui->btn_7, QStringLiteral("."), QStringLiteral("."), true);
configureInputButton(ui->btn_8, QStringLiteral("_"), QStringLiteral("_"), true);
configureInputButton(ui->btn_9, QStringLiteral("@"), QStringLiteral("@"), true);
configureInputButton(ui->btn_sub, QStringLiteral("123"), QString(), true, true);
configureInputButton(ui->btn_0, QStringLiteral("+"), QStringLiteral("+"), true);
configureInputButton(ui->pushButton_dot, QStringLiteral(","), QStringLiteral(","), true);
} }
void NumKeyDia::configureInputButton(QPushButton *button,
const QString &label,
const QString &value,
bool enabled,
bool isModeSwitch)
{
if(!button)
{
return;
}
button->setText(label);
button->setEnabled(enabled);
button->setProperty("inputValue", value);
button->setProperty("isModeSwitch", isModeSwitch);
} }
namespace KeyBoard
{
NumKeyDia *app()
{
return NumKeyDia::instance();
};
};

49
numkeydia.h
View File

@ -3,72 +3,47 @@
#include "NumKeyBoard_global.h" #include "NumKeyBoard_global.h"
#include <QDialog> #include <QDialog>
#include <QLineEdit> #include <QScopedPointer>
class QPushButton; // 向前声明
namespace Ui {
namespace Ui
{
class NumKeyDia; class NumKeyDia;
} }
class NumKeyDiaPrivate;
class NUMKEYBOARD_EXPORT NumKeyDia : public QDialog class NUMKEYBOARD_EXPORT NumKeyDia : public QDialog
{ {
Q_OBJECT Q_OBJECT
// 声明私有类
Q_DECLARE_PRIVATE(NumKeyDia)
public: public:
explicit NumKeyDia(QWidget *parent = nullptr); explicit NumKeyDia(QWidget *parent = nullptr);
~NumKeyDia(); ~NumKeyDia();
static NumKeyDia *instance() static NumKeyDia *instance();
{
return singleton;
}
void setValue(const QString &value); void setValue(const QString &value);
QString &getValue(); QString &getValue();
protected: protected:
virtual bool eventFilter(QObject *obj, QEvent *event) override; bool eventFilter(QObject *obj, QEvent *event) override;
private slots: private slots:
void on_btn_ok_clicked(); void on_btn_ok_clicked();
void on_btn_cancel_clicked(); void on_btn_cancel_clicked();
void on_btn_clear_clicked(); void on_btn_clear_clicked();
void on_btn_back_clicked(); void on_btn_back_clicked();
void btn_input_clicked(); void btn_input_clicked();
void closeKeyBoard(); void closeKeyBoard();
private: private:
enum class InputPage // 使用 QScopedPointer 管理私有实现类
{ QScopedPointer<NumKeyDiaPrivate> d_ptr;
NumberPage,
SymbolPage
};
void setInputPage(InputPage page);
void refreshInputButtons();
void configureInputButton(QPushButton *button,
const QString &label,
const QString &value,
bool enabled,
bool isModeSwitch = false);
Ui::NumKeyDia *ui;
static NumKeyDia *singleton; static NumKeyDia *singleton;
QString value = QString(); // 禁用拷贝
Q_DISABLE_COPY(NumKeyDia)
QPoint m_point;
bool m_firstInputFlag = true;
InputPage m_inputPage = InputPage::NumberPage;
}; };
namespace KeyBoard namespace KeyBoard

2
numkeydia.ui
View File

@ -82,7 +82,7 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">border-image: url(:/Images/keyboard.svg);</string> <string notr="true">border-image: url(:/keyboard.svg);</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>

Write Preview
Loading…
Cancel
Save