diff --git a/protoDebuger/CMakeLists.txt b/protoDebuger/CMakeLists.txt index 43921f4..55842e4 100644 --- a/protoDebuger/CMakeLists.txt +++ b/protoDebuger/CMakeLists.txt @@ -97,7 +97,7 @@ target_compile_definitions(protoDebuger find_package( Qt5SerialPort) find_package( Qt5QuickWidgets) -target_link_directories(protoDebuger PUBLIC third/libevent/include/pkgsrc/include) +target_link_directories(protoDebuger PUBLIC third/libevent/lib) target_link_libraries(protoDebuger PRIVATE Qt5::Core Qt5::Quick Qt5::Widgets Qt5::SerialPort Qt5::Network Qt5::QuickWidgets event.lib event_extra.lib event_core.lib ws2_32) diff --git a/protoDebuger/main.qml b/protoDebuger/main.qml index 25c8a75..7637d90 100644 --- a/protoDebuger/main.qml +++ b/protoDebuger/main.qml @@ -39,7 +39,7 @@ Rectangle { proto_debug.visible = false } background: Image { - source: "qrc:///res/serial.svg" + source: btn_serial.hovered? "qrc:///res/proto_hover.svg": "qrc:///res/serial.svg" } } Text { @@ -60,14 +60,18 @@ Rectangle { onClicked: { } - background: Image { - source: "qrc:///res/net.svg" + background: Image { + source: button_net.hovered? "qrc:///res/nethover.svg":"qrc:///res/net.svg" } + onPressed:{ uart_choose.visible = false net_choose.visible = true proto_debug.visible = false } + + + } Text { id: label_net diff --git a/protoDebuger/mainwindow.cpp b/protoDebuger/mainwindow.cpp index acf5ce3..b575e03 100644 --- a/protoDebuger/mainwindow.cpp +++ b/protoDebuger/mainwindow.cpp @@ -21,7 +21,7 @@ MainWindow::MainWindow(QWidget *parent) : m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView ); m_quickWidget->setSource(source); m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal); - + this->setStyleSheet("margin: 0px;"); gGlobal.SetQuickView(m_quickWidget); ui->centralwidget->layout()->addWidget(m_quickWidget); } diff --git a/protoDebuger/mainwindow.ui b/protoDebuger/mainwindow.ui index ff8f1be..d7427f6 100644 --- a/protoDebuger/mainwindow.ui +++ b/protoDebuger/mainwindow.ui @@ -53,7 +53,6 @@ - diff --git a/protoDebuger/qml.qrc b/protoDebuger/qml.qrc index be626f4..dc27ee4 100644 --- a/protoDebuger/qml.qrc +++ b/protoDebuger/qml.qrc @@ -8,5 +8,7 @@ NetSelect.qml ProtoDebug.qml TcpSwarm.qml + res/nethover.svg + res/proto_hover.svg diff --git a/protoDebuger/res/net.svg b/protoDebuger/res/net.svg index 1b202cd..6c893c9 100644 --- a/protoDebuger/res/net.svg +++ b/protoDebuger/res/net.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/protoDebuger/res/nethover.svg b/protoDebuger/res/nethover.svg new file mode 100644 index 0000000..b353360 --- /dev/null +++ b/protoDebuger/res/nethover.svg @@ -0,0 +1 @@ + \ No newline at end of file