diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 36c36d6..155f529 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -170,7 +170,7 @@ void MainWindow::init()
if (currentViewCandidate != VIEW_ENGINEER &&
currentViewCandidate != VIEW_MISSION &&
currentViewCandidate != VIEW_FLIGHT &&
- currentViewCandidate != VIEW_FULL)
+ currentViewCandidate != VIEW_DEFAULT)
{
currentView = currentViewCandidate;
}
@@ -364,7 +364,6 @@ void MainWindow::init()
ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Meta+3", 0));
ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Meta+4", 0));
ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Meta+5", 0));
- ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Meta+U", 0));
ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0));
#else
ui.actionFlightView->setShortcut(QApplication::translate("MainWindow", "Ctrl+1", 0));
@@ -372,7 +371,6 @@ void MainWindow::init()
ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Ctrl+3", 0));
ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Ctrl+4", 0));
ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Ctrl+5", 0));
- ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Ctrl+U", 0));
ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0));
#endif
@@ -1202,7 +1200,6 @@ void MainWindow::connectCommonActions()
perspectives->addAction(ui.actionHardwareConfig);
perspectives->addAction(ui.actionSoftwareConfig);
perspectives->addAction(ui.actionTerminalView);
- perspectives->addAction(ui.actionUnconnectedView);
perspectives->addAction(ui.actionGoogleEarthView);
perspectives->addAction(ui.actionLocal3DView);
perspectives->setExclusive(true);
@@ -1262,11 +1259,6 @@ void MainWindow::connectCommonActions()
ui.actionLocal3DView->setChecked(true);
ui.actionLocal3DView->activate(QAction::Trigger);
}
- if (currentView == VIEW_UNCONNECTED)
- {
- ui.actionUnconnectedView->setChecked(true);
- ui.actionUnconnectedView->activate(QAction::Trigger);
- }
// The UAS actions are not enabled without connection to system
ui.actionLiftoff->setEnabled(false);
@@ -1297,7 +1289,6 @@ void MainWindow::connectCommonActions()
connect(ui.actionSimulationView, SIGNAL(triggered()), this, SLOT(loadSimulationView()));
connect(ui.actionEngineersView, SIGNAL(triggered()), this, SLOT(loadEngineerView()));
connect(ui.actionMissionView, SIGNAL(triggered()), this, SLOT(loadOperatorView()));
- connect(ui.actionUnconnectedView, SIGNAL(triggered()), this, SLOT(loadUnconnectedView()));
connect(ui.actionHardwareConfig,SIGNAL(triggered()),this,SLOT(loadHardwareConfigView()));
connect(ui.actionGoogleEarthView, SIGNAL(triggered()), this, SLOT(loadGoogleEarthView()));
connect(ui.actionLocal3DView, SIGNAL(triggered()), this, SLOT(loadLocal3DView()));
@@ -1631,7 +1622,7 @@ void MainWindow::UASCreated(UASInterface* uas)
watchdogControlDockWidget->setObjectName("WATCHDOG_CONTROL_DOCKWIDGET");
}
}
-
+
// Reload view state in case new widgets were added
loadViewState();
}
@@ -1718,8 +1709,7 @@ void MainWindow::loadViewState()
case VIEW_LOCAL3D:
centerStack->setCurrentWidget(local3DView);
break;
- case VIEW_UNCONNECTED:
- case VIEW_FULL:
+ case VIEW_DEFAULT:
default:
if (controlDockWidget)
{
@@ -1867,17 +1857,6 @@ void MainWindow::loadLocal3DView()
}
}
-void MainWindow::loadUnconnectedView()
-{
- if (currentView != VIEW_UNCONNECTED)
- {
- storeViewState();
- currentView = VIEW_UNCONNECTED;
- ui.actionUnconnectedView->setChecked(true);
- loadViewState();
- }
-}
-
void MainWindow::loadPilotView()
{
if (currentView != VIEW_FLIGHT)
diff --git a/src/ui/MainWindow.h b/src/ui/MainWindow.h
index 866c2c7..5e65b73 100644
--- a/src/ui/MainWindow.h
+++ b/src/ui/MainWindow.h
@@ -224,8 +224,6 @@ public slots:
/** @brief Load configuration views */
void loadHardwareConfigView();
void loadSoftwareConfigView();
- /** @brief Load default view when no MAV is connected */
- void loadUnconnectedView();
/** @brief Load view for pilot */
void loadPilotView();
/** @brief Load view for simulation */
@@ -343,8 +341,7 @@ protected:
VIEW_TERMINAL,
VIEW_LOCAL3D,
VIEW_GOOGLEEARTH,
- VIEW_UNCONNECTED, ///< View in unconnected mode, when no UAS is available
- VIEW_FULL ///< All widgets shown at once
+ VIEW_DEFAULT
} VIEW_SECTIONS;
/**
diff --git a/src/ui/MainWindow.ui b/src/ui/MainWindow.ui
index b4c3c1b..8bd8c46 100644
--- a/src/ui/MainWindow.ui
+++ b/src/ui/MainWindow.ui
@@ -51,7 +51,7 @@
0
0
1024
- 22
+ 21