hgf/qt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ledok

This commit is contained in:
gangphon 2023-04-23 14:30:16 +08:00
parent 548a1e4e88
commit 7f44fd1ca5
4 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
LedOK/LedOK.pro
View File

@ -259,7 +259,7 @@ include(./xlsx/qtxlsx.pri)
include(./QSimpleUpdater/QSimpleUpdater.pri) include(./QSimpleUpdater/QSimpleUpdater.pri)
copy.files += $$quote(y50 param) copydir.files += $$quote(y50 param)
win32 { win32 {
INCLUDEPATH += $$PWD/ffmpeg/include INCLUDEPATH += $$PWD/ffmpeg/include
@ -272,15 +272,17 @@ LIBS += -L$$PWD/ffmpeg/lib/\
-lswresample \ -lswresample \
-lswscale -lswscale
CONFIG += file_copies
copy.path = $$OUT_PWD copy.path = $$OUT_PWD
copydir.path = $$OUT_PWD
copy.files += $$files(ffmpeg/bin/*.dll) copy.files += $$files(ffmpeg/bin/*.dll)
copy.files += ffmpeg/bin/ffmpeg.exe copy.files += ffmpeg/bin/ffmpeg.exe
copy.files += 7z/7z.dll copy.files += 7z/7z.dll
copy.files += 7z/7z.exe copy.files += 7z/7z.exe
# for https requests # for https requests
copy.files += $$files(OpenSSL/*.dll) copy.files += $$files(OpenSSL/*.dll)
CONFIG += file_copies
COPIES += copy COPIES += copy
COPIES += copydir
} }
osx { osx {
INCLUDEPATH += $$PWD/ffmpeg-mac/include INCLUDEPATH += $$PWD/ffmpeg-mac/include
@ -293,6 +295,6 @@ LIBS += -L$$PWD/ffmpeg-mac/lib/\
-lswresample \ -lswresample \
-lswscale -lswscale
copy.path = Contents/MacOS copydir.path = Contents/MacOS
QMAKE_BUNDLE_DATA += copy QMAKE_BUNDLE_DATA += copydir
} }

36
LedOK/device/ctrlnetworkpanel.cpp
View File

@ -48,7 +48,8 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) {
hhh->addWidget(labelIpAddress = new QLabel); hhh->addWidget(labelIpAddress = new QLabel);
fdIP = new QLineEdit; fdIP = new QLineEdit;
fdIP->setInputMask("000.000.000.000"); fdIP->setInputMask("000.000.000.000;_");
fdIP->setAlignment(Qt::AlignCenter);
fdIP->setFixedWidth(160); fdIP->setFixedWidth(160);
hhh->addWidget(fdIP); hhh->addWidget(fdIP);
@ -57,7 +58,8 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) {
hhh->addWidget(labelMaskAddress = new QLabel); hhh->addWidget(labelMaskAddress = new QLabel);
fdMask = new QLineEdit; fdMask = new QLineEdit;
fdMask->setInputMask("000.000.000.000"); fdMask->setInputMask("000.000.000.000;_");
fdMask->setAlignment(Qt::AlignCenter);
fdMask->setFixedWidth(160); fdMask->setFixedWidth(160);
hhh->addWidget(fdMask); hhh->addWidget(fdMask);
@ -66,7 +68,8 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) {
hhh->addWidget(labelGateway = new QLabel); hhh->addWidget(labelGateway = new QLabel);
fdGateWay = new QLineEdit; fdGateWay = new QLineEdit;
fdGateWay->setInputMask("000.000.000.000"); fdGateWay->setInputMask("000.000.000.000;_");
fdGateWay->setAlignment(Qt::AlignCenter);
fdGateWay->setFixedWidth(160); fdGateWay->setFixedWidth(160);
hhh->addWidget(fdGateWay); hhh->addWidget(fdGateWay);
@ -75,7 +78,8 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) {
hhh->addWidget(labelDnsAddress = new QLabel); hhh->addWidget(labelDnsAddress = new QLabel);
fdDns = new QLineEdit; fdDns = new QLineEdit;
fdDns->setInputMask("000.000.000.000"); fdDns->setInputMask("000.000.000.000;_");
fdDns->setAlignment(Qt::AlignCenter);
fdDns->setFixedWidth(160); fdDns->setFixedWidth(160);
hhh->addWidget(fdDns); hhh->addWidget(fdDns);
} }
@ -94,32 +98,32 @@ CtrlNetworkPanel::CtrlNetworkPanel(QWidget *parent) : QWidget(parent) {
QMessageBox::information(gMainWin, tr("Tip"), tr("NoSelectedController")); QMessageBox::information(gMainWin, tr("Tip"), tr("NoSelectedController"));
return; return;
} }
QString ip = fdIP->text().trimmed(); QString ip = fdIP->text();
QString mask = fdMask->text().trimmed(); QString mask = fdMask->text();
QString gateWay = fdGateWay->text().trimmed(); QString gateWay = fdGateWay->text();
QString dns = fdDns->text().trimmed(); QString dns = fdDns->text();
if(fdDhcp->isChecked()) { if(fdDhcp->isChecked()) {
if(ip.isEmpty()) ip = "0.255.255.255"; if(ip=="...") ip = "0.255.255.255";
if(mask.isEmpty()) mask = "0.255.255.255"; if(mask=="...") mask = "0.255.255.255";
if(gateWay.isEmpty()) gateWay = "0.255.255.255"; if(gateWay=="...") gateWay = "0.255.255.255";
if(dns.isEmpty()) dns = "0.255.255.255"; if(dns=="...") dns = "0.255.255.255";
} else { } else {
if(ip.isEmpty()) { if(ip=="...") {
QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input IP address!")); QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input IP address!"));
fdIP->setFocus(); fdIP->setFocus();
return; return;
} }
if(mask.isEmpty()) { if(mask=="...") {
QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input Mask address!")); QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input Mask address!"));
fdMask->setFocus(); fdMask->setFocus();
return; return;
} }
if(gateWay.isEmpty()) { if(gateWay=="...") {
QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input Gateway address!")); QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input Gateway address!"));
fdGateWay->setFocus(); fdGateWay->setFocus();
return; return;
} }
if(dns.isEmpty()) { if(dns=="...") {
QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input DNS address!")); QMessageBox::warning(gMainWin, tr("Attention"), tr("Please input DNS address!"));
fdDns->setFocus(); fdDns->setFocus();
return; return;

4
LedOK/program/pageeditor.cpp
View File

@ -116,10 +116,6 @@ void PageEditor::keyReleaseEvent(QKeyEvent *event) {
default:break; default:break;
} }
} }
void PageEditor::wheelEvent(QWheelEvent *e) {
qDebug()<<"angleDelta"<<e->angleDelta().y()<<"pixelDelta"<<e->pixelDelta().y();
onScale(e->angleDelta().y() / 2);
}
QList<EBase*> PageEditor::sortedEles() { QList<EBase*> PageEditor::sortedEles() {
QList<EBase*> eles; QList<EBase*> eles;

5
LedOK/program/pageeditor.h
View File

@ -12,16 +12,13 @@ public:
explicit PageEditor(QWidget *parent = nullptr); explicit PageEditor(QWidget *parent = nullptr);
virtual void keyReleaseEvent(QKeyEvent *event) override; virtual void keyReleaseEvent(QKeyEvent *event) override;
virtual void wheelEvent(QWheelEvent*event) override;
QList<EBase*> sortedEles(); QList<EBase*> sortedEles();
EBase* getElementSelected(); EBase* getElementSelected();
QGraphicsView *graphicsView; QGraphicsView *graphicsView;
QLabel *fdScale; QLabel *fdScale;
int curScale = 100; int curScale{100};
signals:
void scaleChanged(int);
public slots: public slots:
void onScale(int); void onScale(int);