From 65fa4437458c2d3f951cb5bc2327a3fc1d6b1f02 Mon Sep 17 00:00:00 2001
From: zcy <290198252@qq.com>
Date: Tue, 13 Jul 2021 00:38:29 +0800
Subject: [PATCH] no message

---
 protoDebuger/CMakeLists.txt |  5 +++-
 protoDebuger/main.cpp       | 20 ++++++++------
 protoDebuger/mainwindow.cpp | 34 +++++++++++++++++++++++
 protoDebuger/mainwindow.h   | 24 ++++++++++++++++
 protoDebuger/mainwindow.ui  | 55 +++++++++++++++++++++++++++++++++++++
 protoDebuger/sharedata.h    |  1 -
 6 files changed, 128 insertions(+), 11 deletions(-)
 create mode 100644 protoDebuger/mainwindow.cpp
 create mode 100644 protoDebuger/mainwindow.h
 create mode 100644 protoDebuger/mainwindow.ui

diff --git a/protoDebuger/CMakeLists.txt b/protoDebuger/CMakeLists.txt
index fba6605..d68d669 100644
--- a/protoDebuger/CMakeLists.txt
+++ b/protoDebuger/CMakeLists.txt
@@ -25,6 +25,7 @@ set(HEADERS       #  待预编译的cpp头文件
     serialcontroller.h
     sharedata.h
     network_controller.h
+    mainwindow.h
 
 )
 
@@ -35,6 +36,7 @@ set(SOURCES       # 待预编译的cpp代码
     lua_wraper.cpp
     lua_bind.cpp
     network_controller.cpp
+    mainwindow.cpp
 )
 
 set(RESOURCES
@@ -52,6 +54,7 @@ set (NO_MOC_SOURCES
 
 set (UIS
     ${QsswraperUI}
+    mainwindow.ui
 )
 
 include(D:\\project\\c++qt\\qsswraper\\CMakeLists.txt)
@@ -63,7 +66,7 @@ QT5_WRAP_UI(UIC ${UIS})                # uic生成ui_x.h
 
 
 FOREACH(list ${UIC})
-  message("MOC " ${list} )
+  message("UIC " ${list} )
 ENDFOREACH(list)
 
 FOREACH(list ${MOC})
diff --git a/protoDebuger/main.cpp b/protoDebuger/main.cpp
index 359fe78..4ab0a17 100644
--- a/protoDebuger/main.cpp
+++ b/protoDebuger/main.cpp
@@ -13,9 +13,8 @@
 #include "sharedata.h"
 #include "serialcontroller.h"
 #include "lua_wraper.h"
+#include "mainwindow.h"
 
-
-ShareData gGlobal;
 #define test1 293
 
 int main(int argc, char *argv[])
@@ -24,13 +23,16 @@ int main(int argc, char *argv[])
     QApplication  app(argc, argv);
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
-    QQuickWidget *m_quickWidget=new QQuickWidget();
-    QUrl source("qrc:/main.qml");
-    m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
-    m_quickWidget->setSource(source);
-    m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal);
-    m_quickWidget->show();
-    gGlobal.SetQuickView(m_quickWidget);
+    MainWindow w;
+    w.setWindowTitle("协议调试器");
+    w.show();
+//    QQuickWidget *m_quickWidget=new QQuickWidget();
+//    QUrl source("qrc:/main.qml");
+//    m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
+//    m_quickWidget->setSource(source);
+//    m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal);
+//    m_quickWidget->show();
+//    gGlobal.SetQuickView(m_quickWidget);
 
     return app.exec();
 }
diff --git a/protoDebuger/mainwindow.cpp b/protoDebuger/mainwindow.cpp
new file mode 100644
index 0000000..e18a5a1
--- /dev/null
+++ b/protoDebuger/mainwindow.cpp
@@ -0,0 +1,34 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+#include "globalvar.h"
+#include <QQuickView>
+#include <QtQuickWidgets/QQuickWidget>
+#include <QQmlComponent>
+#include <QQmlContext>
+#include "sharedata.h"
+#include <QLayout>
+
+ShareData gGlobal;
+
+
+MainWindow::MainWindow(QWidget *parent) :
+    QssMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+    QQuickWidget *m_quickWidget=new QQuickWidget();
+    QUrl source("qrc:/main.qml");
+    m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
+    m_quickWidget->setSource(source);
+    m_quickWidget->rootContext()->setContextProperty("DataWrap",&gGlobal);
+
+
+    gGlobal.SetQuickView(m_quickWidget);
+    ui->centralwidget->layout()->addWidget(m_quickWidget);
+
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
diff --git a/protoDebuger/mainwindow.h b/protoDebuger/mainwindow.h
new file mode 100644
index 0000000..d98fe81
--- /dev/null
+++ b/protoDebuger/mainwindow.h
@@ -0,0 +1,24 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QMainWindow>
+#include "Qss.h"
+
+
+namespace Ui {
+class MainWindow;
+}
+
+class MainWindow : public QssMainWindow
+{
+    Q_OBJECT
+
+public:
+    explicit MainWindow(QWidget *parent = nullptr);
+    ~MainWindow();
+
+private:
+    Ui::MainWindow *ui;
+};
+
+#endif // MAINWINDOW_H
diff --git a/protoDebuger/mainwindow.ui b/protoDebuger/mainwindow.ui
new file mode 100644
index 0000000..a684504
--- /dev/null
+++ b/protoDebuger/mainwindow.ui
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1183</width>
+    <height>845</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>800</width>
+    <height>600</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1183</width>
+     <height>27</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/protoDebuger/sharedata.h b/protoDebuger/sharedata.h
index 663bbe8..30da8c1 100644
--- a/protoDebuger/sharedata.h
+++ b/protoDebuger/sharedata.h
@@ -67,5 +67,4 @@ private:
 };
 
 
-
 #endif // SHAREDATA_H