flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 01:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #288, formatting, minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2014-11-10 20:53:49 +01:00
committed by Roland Winklmeier
parent 159dbe9f5a
commit 49be1c2bb7
5 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -7,8 +7,6 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
//! \file
#include "atcstationcomponent.h" #include "atcstationcomponent.h"
#include "../views/atcstationview.h" #include "../views/atcstationview.h"
#include "../guiutility.h" #include "../guiutility.h"
@@ -29,8 +27,6 @@ namespace BlackGui
{ {
CAtcStationComponent::CAtcStationComponent(QWidget *parent) : CAtcStationComponent::CAtcStationComponent(QWidget *parent) :
QTabWidget(parent), QTabWidget(parent),
CEnableForDockWidgetInfoArea(),
CEnableForRuntime(nullptr, false),
ui(new Ui::CAtcStationComponent), m_updateTimer(nullptr) ui(new Ui::CAtcStationComponent), m_updateTimer(nullptr)
{ {
ui->setupUi(this); ui->setupUi(this);

8
src/blackgui/components/cockpitcomcomponent.cpp
View File

@@ -99,14 +99,6 @@ namespace BlackGui
this->ui->ds_ComPanelCom2Active->setValue(this->ui->ds_ComPanelCom2Standby->value()); this->ui->ds_ComPanelCom2Active->setValue(this->ui->ds_ComPanelCom2Standby->value());
this->ui->ds_ComPanelCom2Standby->setValue(f); 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(); const CAircraft ownAircraft = this->cockpitValuesToAircraftObject();
this->updateOwnCockpitInContext(ownAircraft); this->updateOwnCockpitInContext(ownAircraft);

4
src/blackgui/components/cockpitcomponent.h
View File

@@ -57,8 +57,8 @@ namespace BlackGui
void toggleShowHideDetails(bool show, bool considerCurrentSize); void toggleShowHideDetails(bool show, bool considerCurrentSize);
QScopedPointer<Ui::CCockpitComponent> ui; QScopedPointer<Ui::CCockpitComponent> ui;
QSize m_sizeFloatingShown; //! size when info area is shown QSize m_sizeFloatingShown; //! size when info area is shown
QSize m_sizeFloatingHidden; //! size when info area is hidden QSize m_sizeFloatingHidden; //! size when info area is hidden
int m_minHeightInfoArea = -1; //! minimum height of the info area int m_minHeightInfoArea = -1; //! minimum height of the info area
}; };

2
src/blackgui/components/settingscomponent.ui
View File

@@ -20,7 +20,7 @@
<string>Settings</string> <string>Settings</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork"> <widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title"> <attribute name="title">

9
src/swiftgui_standard/mainwindow_init.cpp
View File

@@ -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 "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
#include "blackcore/dbus_server.h" #include "blackcore/dbus_server.h"