Skip to content

Q
qgroundcontrol
Commit 93c60772 authored by Mariano Lizarraga's avatar Mariano Lizarraga
Browse files
Options

Cleaned up the MainWindow constructor

parent 57fa90c6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
src/ui/MainWindow.cc
View file @ 93c60772
...@@ -108,11 +108,6 @@ MainWindow::MainWindow(QWidget *parent): ...@@ -108,11 +108,6 @@ MainWindow::MainWindow(QWidget *parent):
// Create actions // Create actions
connectCommonActions(); connectCommonActions();
// Add option for custom widgets
connect(ui.actionNewCustomWidget, SIGNAL(triggered()), this, SLOT(createCustomWidget()));
// Allow to mute audio
ui.actionMuteAudioOutput->setChecked(GAudioOutput::instance()->isMuted());
connect(ui.actionMuteAudioOutput, SIGNAL(triggered(bool)), GAudioOutput::instance(), SLOT(mute(bool)));
// Set dock options // Set dock options
setDockOptions(AnimatedDocks | AllowTabbedDocks | AllowNestedDocks); setDockOptions(AnimatedDocks | AllowTabbedDocks | AllowNestedDocks);
...@@ -124,13 +119,13 @@ MainWindow::MainWindow(QWidget *parent): ...@@ -124,13 +119,13 @@ MainWindow::MainWindow(QWidget *parent):
if (settings.contains("geometry")) if (settings.contains("geometry"))
{ {
// Restore the window geometry // Restore the window geometry
restoreGeometry(settings.value("geometry").toByteArray()); restoreGeometry(settings.value("geometry").toByteArray());
} }
else else
{ {
// Adjust the size // Adjust the size
adjustSize(); adjustSize();
} }
// Populate link menu // Populate link menu
...@@ -957,6 +952,14 @@ void MainWindow::connectCommonActions() ...@@ -957,6 +952,14 @@ void MainWindow::connectCommonActions()
connect(ui.actionOnline_documentation, SIGNAL(triggered()), this, SLOT(showHelp())); connect(ui.actionOnline_documentation, SIGNAL(triggered()), this, SLOT(showHelp()));
connect(ui.actionDeveloper_Credits, SIGNAL(triggered()), this, SLOT(showCredits())); connect(ui.actionDeveloper_Credits, SIGNAL(triggered()), this, SLOT(showCredits()));
connect(ui.actionProject_Roadmap, SIGNAL(triggered()), this, SLOT(showRoadMap())); connect(ui.actionProject_Roadmap, SIGNAL(triggered()), this, SLOT(showRoadMap()));
// Add option for custom widgets
connect(ui.actionNewCustomWidget, SIGNAL(triggered()), this, SLOT(createCustomWidget()));
// Allow to mute audio
ui.actionMuteAudioOutput->setChecked(GAudioOutput::instance()->isMuted());
connect(ui.actionMuteAudioOutput, SIGNAL(triggered(bool)), GAudioOutput::instance(), SLOT(mute(bool)));
} }
void MainWindow::connectPxActions() void MainWindow::connectPxActions()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment