b

App/MenuBarUI/MenuBarUI.cpp

@@ -84,18 +84,16 @@ void MenuBarUI::setPushButtonState(uint8_t state1,uint8_t state2,uint8_t state3,
     ui->pushButton_Mission->style()->unpolish(ui->pushButton_Mission);
     ui->pushButton_Mission->style()->polish(ui->pushButton_Mission);
 
-    ui->pushButton_Flight->setProperty("state",state4);
-    ui->pushButton_Flight->style()->unpolish(ui->pushButton_Flight);
-    ui->pushButton_Flight->style()->polish(ui->pushButton_Flight);
+    ui->pushButton_Base->setProperty("state",state4);
+    ui->pushButton_Base->style()->unpolish(ui->pushButton_Base);
+    ui->pushButton_Base->style()->polish(ui->pushButton_Base);
+
 
     ui->pushButton_Info->setProperty("state",state5);
     ui->pushButton_Info->style()->unpolish(ui->pushButton_Info);
     ui->pushButton_Info->style()->polish(ui->pushButton_Info);
 
 
-    ui->pushButton_Base->setProperty("state",state6);
-    ui->pushButton_Base->style()->unpolish(ui->pushButton_Base);
-    ui->pushButton_Base->style()->polish(ui->pushButton_Base);
 
 }
 
@@ -153,22 +151,8 @@ void MenuBarUI::on_pushButton_Mission_clicked()
     emit IndexChanged(CurrentIndex);
 }
 
-void MenuBarUI::on_pushButton_Flight_clicked()
+void MenuBarUI::on_pushButton_Base_clicked()
 {
-    /*
-    if(CurrentIndex == 3)
-    {
-        CurrentIndex = 5;
-        ui->pushButton_Flight->setText(tr("Base"));
-
-    }
-    else
-    {
-        CurrentIndex = 3;
-        ui->pushButton_Flight->setText(tr("Flight"));
-    }
-    */
-
     CurrentIndex = 3;
 
     setPushButtonState(state::unSelected,
@@ -177,12 +161,14 @@ void MenuBarUI::on_pushButton_Flight_clicked()
                        state::Selected,
                        state::unSelected,
                        state::unSelected);
+
     update();
     emit IndexChanged(CurrentIndex);
+
 }
 
 void MenuBarUI::on_pushButton_Info_clicked()
-{   
+{
     CurrentIndex = 4;
 
     setPushButtonState(state::unSelected,
@@ -191,24 +177,11 @@ void MenuBarUI::on_pushButton_Info_clicked()
                        state::unSelected,
                        state::Selected,
                        state::unSelected);
-
     update();
     emit IndexChanged(CurrentIndex);
 }
 
-void MenuBarUI::on_pushButton_Base_clicked()
-{
-    CurrentIndex = 5;
-    setPushButtonState(state::unSelected,
-                       state::unSelected,
-                       state::unSelected,
-                       state::unSelected,
-                       state::unSelected,
-                       state::Selected);
-    update();
-    emit IndexChanged(CurrentIndex);
 
-}
 
 
 void MenuBarUI::showMessage(const QString &message, int TimeOut)