diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp index 9445e0140..2ed74e245 100644 --- a/src/blackgui/components/atcstationcomponent.cpp +++ b/src/blackgui/components/atcstationcomponent.cpp @@ -7,8 +7,6 @@ * contained in the LICENSE file. */ -//! \file - #include "atcstationcomponent.h" #include "../views/atcstationview.h" #include "../guiutility.h" @@ -29,8 +27,6 @@ namespace BlackGui { CAtcStationComponent::CAtcStationComponent(QWidget *parent) : QTabWidget(parent), - CEnableForDockWidgetInfoArea(), - CEnableForRuntime(nullptr, false), ui(new Ui::CAtcStationComponent), m_updateTimer(nullptr) { ui->setupUi(this); diff --git a/src/blackgui/components/cockpitcomcomponent.cpp b/src/blackgui/components/cockpitcomcomponent.cpp index 6ca64bd37..069b23696 100644 --- a/src/blackgui/components/cockpitcomcomponent.cpp +++ b/src/blackgui/components/cockpitcomcomponent.cpp @@ -99,14 +99,6 @@ namespace BlackGui this->ui->ds_ComPanelCom2Active->setValue(this->ui->ds_ComPanelCom2Standby->value()); this->ui->ds_ComPanelCom2Standby->setValue(f); } - else if (sender == this->ui->cbp_ComPanelTransponderMode) - { - // toggle the external button - if (this->ui->cbp_ComPanelTransponderMode->isIdentSelected()) - { - // todo - } - } const CAircraft ownAircraft = this->cockpitValuesToAircraftObject(); this->updateOwnCockpitInContext(ownAircraft); diff --git a/src/blackgui/components/cockpitcomponent.h b/src/blackgui/components/cockpitcomponent.h index 334a6a48a..232d00624 100644 --- a/src/blackgui/components/cockpitcomponent.h +++ b/src/blackgui/components/cockpitcomponent.h @@ -57,8 +57,8 @@ namespace BlackGui void toggleShowHideDetails(bool show, bool considerCurrentSize); QScopedPointer ui; - QSize m_sizeFloatingShown; //! size when info area is shown - QSize m_sizeFloatingHidden; //! size when info area is hidden + QSize m_sizeFloatingShown; //! size when info area is shown + QSize m_sizeFloatingHidden; //! size when info area is hidden int m_minHeightInfoArea = -1; //! minimum height of the info area }; diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui index 971923c04..e8481c8bf 100644 --- a/src/blackgui/components/settingscomponent.ui +++ b/src/blackgui/components/settingscomponent.ui @@ -20,7 +20,7 @@ Settings - 0 + 1 diff --git a/src/swiftgui_standard/mainwindow_init.cpp b/src/swiftgui_standard/mainwindow_init.cpp index d50516187..bc1ffbf69 100644 --- a/src/swiftgui_standard/mainwindow_init.cpp +++ b/src/swiftgui_standard/mainwindow_init.cpp @@ -1,3 +1,12 @@ +/* Copyright (C) 2013 + * swift project Community / Contributors + * + * This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level + * directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project, + * including this file, may be copied, modified, propagated, or distributed except according to the terms + * contained in the LICENSE file. + */ + #include "mainwindow.h" #include "ui_mainwindow.h" #include "blackcore/dbus_server.h"