文档修改

src/main/loginui.cpp

@@ -3,6 +3,7 @@
 #include <QMovie>
 #include <QWidget>
 #include <QMouseEvent>
+#include <QApplication>
 
 LoginUi::LoginUi(QWidget *parent) :
     QMainWindow(parent),
@@ -82,8 +83,11 @@ bool LoginUi::verifyAccount(string usr, string pwd){
 
 void LoginUi::changetoMainwindow(){
     this->close();
-    MainWindow CEC(0,0,0);
-    CEC.show();
+
+    //MainWindow CEC(0,0,0);
+    //CEC.show();
+
+
 }
 
 

src/main/main.cpp

@@ -16,7 +16,7 @@ int main(int argc, char** argv)
     CEC.show();
     //LoginUi a(0);
     //a.show();
-    return app.exec();
+    app.exec();
 
     return(0);
 }

src/main/mainwindow.cpp

@@ -287,8 +287,7 @@ void MainWindow::setBtnStyles(){
      * set PushButton state
      */
 
-    ui->btn_main->setIcon(QIcon("://images/up.png"));
-    ui->btn_main->setText("mainWidget");
+
     ui->btn_main->setStyleSheet(
                 "QPushButton:hover{"
                 "background-color:rgb(186, 189, 182);"

src/ui/loginui.ui

@@ -841,8 +841,8 @@ background-color:none</string>
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>205</width>
-              <height>104</height>
+              <width>579</width>
+              <height>196</height>
              </rect>
             </property>
             <attribute name="label">
@@ -902,8 +902,8 @@ background-color:none</string>
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>88</width>
-              <height>88</height>
+              <width>579</width>
+              <height>196</height>
              </rect>
             </property>
             <attribute name="label">
@@ -926,7 +926,7 @@ background-color:none</string>
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>267</width>
+              <width>565</width>
               <height>312</height>
              </rect>
             </property>
@@ -1251,8 +1251,8 @@ background-color:none</string>
              <rect>
               <x>0</x>
               <y>0</y>
-              <width>313</width>
-              <height>133</height>
+              <width>579</width>
+              <height>196</height>
              </rect>
             </property>
             <attribute name="label">

src/ui/mainwindow.ui

@@ -47,7 +47,7 @@
          <string notr="true"/>
         </property>
         <property name="text">
-         <string/>
+         <string>Main</string>
         </property>
         <property name="iconSize">
          <size>
@@ -69,7 +69,7 @@
          <string notr="true"/>
         </property>
         <property name="text">
-         <string/>
+         <string>Tello</string>
         </property>
         <property name="iconSize">
          <size>
@@ -94,7 +94,7 @@
          <string notr="true"/>
         </property>
         <property name="text">
-         <string/>
+         <string>Robo</string>
         </property>
         <property name="icon">
          <iconset theme="://images/toolbar_dash.png">
@@ -673,7 +673,7 @@ QProgressBar::chunk
                 </size>
                </property>
                <property name="text">
-                <string>PushButton</string>
+                <string>获取目标</string>
                </property>
               </widget>
              </item>
@@ -699,7 +699,7 @@ QProgressBar::chunk
                 </size>
                </property>
                <property name="text">
-                <string>shortcut</string>
+                <string/>
                </property>
               </widget>
              </item>
@@ -1286,7 +1286,7 @@ background-color: rgb(255,255,255);
                   </size>
                  </property>
                  <property name="text">
-                  <string>system</string>
+                  <string>Auto</string>
                  </property>
                 </widget>
                </item>
@@ -1299,7 +1299,7 @@ background-color: rgb(255,255,255);
                   </size>
                  </property>
                  <property name="text">
-                  <string>keyboard</string>
+                  <string>Keyboard</string>
                  </property>
                 </widget>
                </item>
@@ -1358,7 +1358,7 @@ background-color: rgb(255,255,255);
             </size>
            </property>
            <property name="title">
-            <string>Logging</string>
+            <string>Camera</string>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout">
             <item>