fix: 合并main，解决冲突
commit
143df8703e
@ -0,0 +1,104 @@
|
|||||||
|
QT += core gui webenginewidgets
|
||||||
|
QT += network
|
||||||
|
QT += quickwidgets qml
|
||||||
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||||
|
|
||||||
|
CONFIG += c++17
|
||||||
|
# CONFIG += console
|
||||||
|
QMAKE_PROJECT_DEPTH = 0
|
||||||
|
# You can make your code fail to compile if it uses deprecated APIs.
|
||||||
|
# In order to do so, uncomment the following line.
|
||||||
|
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
SOURCES += \
|
||||||
|
# Src/GDDC/gddcCmdDlg.cpp \
|
||||||
|
# Src/GDDC/gddcSet.cpp \
|
||||||
|
# Src/GDDC/gddcStateInfo.cpp \
|
||||||
|
# Src/HomePage/homepagesetingwidget.cpp \
|
||||||
|
# cffmpeg_decode.cpp \
|
||||||
|
# customwebenginepage.cpp \
|
||||||
|
# cwebengineview.cpp \
|
||||||
|
# encodemodelcamera.cpp \
|
||||||
|
# ffmpegvideodlg.cpp \
|
||||||
|
# Src/GDDC/gddcdlg.cpp \
|
||||||
|
SDFPDlg.cpp \
|
||||||
|
global.cpp \
|
||||||
|
# Src/HomePage/homepagedlg.cpp \
|
||||||
|
main.cpp \
|
||||||
|
mainwindow.cpp \
|
||||||
|
# modelcameradlg.cpp \
|
||||||
|
# qweb.cpp \
|
||||||
|
# rescueload.cpp \
|
||||||
|
# rescueloadwidget.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
# DCFrameCkCmd.h \
|
||||||
|
# Src/GDDC/gddcCmdDlg.h \
|
||||||
|
# Src/GDDC/gddcSet.h \
|
||||||
|
# Src/GDDC/gddcStateInfo.h \
|
||||||
|
# Src/GDDC/structDefineMyslef.h \
|
||||||
|
# Src/HomePage/homepagesetingwidget.h \
|
||||||
|
# cffmpeg_decode.h \
|
||||||
|
# customwebenginepage.h \
|
||||||
|
# cwebengineview.h \
|
||||||
|
# encodemodelcamera.h \
|
||||||
|
# ffmpegvideodlg.h \
|
||||||
|
# Src/GDDC/gddcdlg.h \
|
||||||
|
SDFPDlg.h \
|
||||||
|
global.h \
|
||||||
|
# Src/HomePage/homepagedlg.h \
|
||||||
|
mainwindow.h \
|
||||||
|
# modelcameradlg.h \
|
||||||
|
# qweb.h \
|
||||||
|
# rescueload.h \
|
||||||
|
# rescueloadwidget.h
|
||||||
|
|
||||||
|
FORMS += \
|
||||||
|
# Src/GDDC/gddcCmdDlg.ui \
|
||||||
|
# Src/GDDC/gddcSet.ui \
|
||||||
|
# Src/GDDC/gddcStateInfo.ui \
|
||||||
|
# Src/HomePage/homepagesetingwidget.ui \
|
||||||
|
# ffmpegvideodlg.ui \
|
||||||
|
# Src/GDDC/gddcdlg.ui \
|
||||||
|
# Src/HomePage/homepagedlg.ui \
|
||||||
|
SDFPDlg.ui \
|
||||||
|
mainwindow.ui \
|
||||||
|
# modelcameradlg.ui \
|
||||||
|
# qweb.ui \
|
||||||
|
# rescueloadwidget.ui
|
||||||
|
|
||||||
|
TRANSLATIONS += \
|
||||||
|
PayloadAPP_zh_CN.ts
|
||||||
|
CONFIG += lrelease
|
||||||
|
CONFIG += embed_translations
|
||||||
|
|
||||||
|
# Default rules for deployment.
|
||||||
|
qnx: target.path = /tmp/$${TARGET}/bin
|
||||||
|
else: unix:!android: target.path = /opt/$${TARGET}/bin
|
||||||
|
!isEmpty(target.path): INSTALLS += target
|
||||||
|
|
||||||
|
RESOURCES += \
|
||||||
|
mainwindow.qrc \
|
||||||
|
# map/places_map.qrc
|
||||||
|
|
||||||
|
DISTFILES += \
|
||||||
|
config.ini \
|
||||||
|
res/Qss/qss.qss \
|
||||||
|
style.qss
|
||||||
|
|
||||||
|
INCLUDEPATH += $$PWD/ffmpeg/include \
|
||||||
|
$$PWD/Src/Video/
|
||||||
|
|
||||||
|
LIBS += -L$$PWD/ffmpeg/lib \
|
||||||
|
-lavcodec -lavdevice -lavfilter -lavformat -lavutil -lpostproc \
|
||||||
|
-lswresample -lswscale
|
||||||
|
|
||||||
|
include($$PWD/Src/HomePage/HomePage.pri)
|
||||||
|
include($$PWD/Src/WebPage/WebPage.pri)
|
||||||
|
include($$PWD/Src/ModelCamera/ModelCamera.pri)
|
||||||
|
include($$PWD/Src/RescueLoad/RescueLoad.pri)
|
||||||
|
include($$PWD/Src/GDDC/GDDC.pri)
|
||||||
|
include($$PWD/Src/Video/Video.pri)
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
#include "SDFPDlg.h"
|
||||||
|
#include "ui_SDFPDlg.h"
|
||||||
|
|
||||||
|
SDFPDlg::SDFPDlg(QWidget *parent)
|
||||||
|
: QWidget(parent)
|
||||||
|
, ui(new Ui::SDFPDlg)
|
||||||
|
{
|
||||||
|
ui->setupUi(this);
|
||||||
|
QPalette palette;
|
||||||
|
//设置主窗口背景颜色
|
||||||
|
palette.setColor(QPalette::Window,QColor(50, 50, 50));
|
||||||
|
this->setPalette(palette);
|
||||||
|
//嵌入到主窗口
|
||||||
|
setWindowFlags(Qt::CustomizeWindowHint|Qt::FramelessWindowHint);
|
||||||
|
hide();
|
||||||
|
}
|
||||||
|
|
||||||
|
SDFPDlg::~SDFPDlg()
|
||||||
|
{
|
||||||
|
delete ui;
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
#ifndef SDFPDLG_H
|
||||||
|
#define SDFPDLG_H
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
namespace Ui {
|
||||||
|
class SDFPDlg;
|
||||||
|
}
|
||||||
|
|
||||||
|
class SDFPDlg : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit SDFPDlg(QWidget *parent = nullptr);
|
||||||
|
~SDFPDlg();
|
||||||
|
|
||||||
|
private:
|
||||||
|
Ui::SDFPDlg *ui;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // SDFPDLG_H
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<ui version="4.0">
|
||||||
|
<class>SDFPDlg</class>
|
||||||
|
<widget class="QWidget" name="SDFPDlg">
|
||||||
|
<property name="geometry">
|
||||||
|
<rect>
|
||||||
|
<x>0</x>
|
||||||
|
<y>0</y>
|
||||||
|
<width>768</width>
|
||||||
|
<height>440</height>
|
||||||
|
</rect>
|
||||||
|
</property>
|
||||||
|
<property name="windowTitle">
|
||||||
|
<string>Form</string>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true"/>
|
||||||
|
</property>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Policy::Fixed</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QWidget" name="widget" native="true">
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">image: url(:/res/981csNew.png);</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="horizontalSpacer_2">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Horizontal</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Policy::Fixed</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>40</width>
|
||||||
|
<height>20</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
<resources/>
|
||||||
|
<connections/>
|
||||||
|
</ui>
|
||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 81 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
Loading…
Reference in New Issue