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

refs #335, Minor tweaks:

Browse Source 
* Formatting
* renaming
* fixed some issues of cppcheck
* new icons
* smooth scrolling in views, stretching for few columns
* fixed start timer in updatetimer
* background colors of some LEDs
This commit is contained in:
Klaus Basan
2014-10-24 23:55:36 +02:00
committed by Roland Winklmeier
parent a9768566e6
commit 43ecc238ed
36 changed files with 186 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,7 @@ namespace BlackGui
CAircraftComponent::CAircraftComponent(QWidget *parent) :
QTabWidget(parent),
CEnableForDockWidgetInfoArea(),
CEnableForRuntime(nullptr, false),
ui(new Ui::CAircraftComponent), m_updateTimer(nullptr)
ui(new Ui::CAircraftComponent)
{
ui->setupUi(this);
this->tabBar()->setExpanding(false);

2
src/blackgui/components/aircraftcomponent.h
View File

@@ -75,7 +75,7 @@ namespace BlackGui
private:
QScopedPointer<Ui::CAircraftComponent> ui;
CUpdateTimer *m_updateTimer;
CUpdateTimer *m_updateTimer = nullptr;
};
}
}

2
src/blackgui/components/cockpitv1component.cpp
View File

@@ -64,7 +64,7 @@ namespace BlackGui
this->connect(this->ui->pb_CockpitToggleCom2, &QPushButton::clicked, this, &CCockpitV1Component::cockpitValuesChanged);
this->connect(this->ui->pb_CockpitSelcalTest, &QPushButton::clicked, this, &CCockpitV1Component::testSelcal);
this->connect(this->ui->cbp_CockpitTransponderMode, &CTransponderModeSelector::valueChanged, this, &CCockpitV1Component::cockpitValuesChanged);
this->connect(this->ui->cbp_CockpitTransponderMode, &CTransponderModeSelector::transponderModeChanged, this, &CCockpitV1Component::cockpitValuesChanged);
this->connect(this->ui->di_CockpitCom1Volume, &QDial::valueChanged, this, &CCockpitV1Component::setCom1Volume);
this->connect(this->ui->di_CockpitCom2Volume, &QDial::valueChanged, this, &CCockpitV1Component::setCom2Volume);

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

@@ -49,8 +49,8 @@ namespace BlackGui
this->ui->led_Simulator->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Simulator connected", "Simulator disconnected", 14);
shape = CLedWidget::Rounded;
this->ui->led_Ptt->setValues(CLedWidget::Yellow, CLedWidget::Red, shape, "Ptt", "Silence", 18);
this->ui->led_Audio->setValues(CLedWidget::Yellow, CLedWidget::Red, shape, "On", "Muted", 18);
this->ui->led_Ptt->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "Ptt", "Silence", 18);
this->ui->led_Audio->setValues(CLedWidget::Yellow, CLedWidget::Black, shape, "On", "Muted", 18);
}
void CInfoBarStatusComponent::setDBusStatus(bool dbus)

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

@@ -20,8 +20,12 @@ namespace BlackGui
this->m_timer = new QTimer(this);
this->m_timerSingleShot = new QTimer(this);
this->m_timerSingleShot->setSingleShot(true);
this->connect(this->m_timer, SIGNAL(timeout()), parent, slot);
this->connect(this->m_timerSingleShot, SIGNAL(timeout()), parent, slot);
bool c = this->connect(this->m_timer, SIGNAL(timeout()), parent, slot);
Q_ASSERT(c);
c = this->connect(this->m_timerSingleShot, SIGNAL(timeout()), parent, slot);
Q_ASSERT(c);
Q_UNUSED(c);
}
CUpdateTimer::~CUpdateTimer()

3
src/blackgui/components/updatetimer.h
View File

@@ -48,6 +48,9 @@ namespace BlackGui
//! Stop timer
void stopTimer() { this->setUpdateInterval(-1); this->m_timerSingleShot->stop(); }
//! Start timer
void startTimer(int milliSeconds) { this->setUpdateInterval(milliSeconds);}
//! Fire the timer straight away
void fireTimer();

3
src/blackgui/components/voiceroomscomponent.h
View File

@@ -48,7 +48,7 @@ namespace BlackGui
//! Return pressed
void ps_voiceRoomUrlsReturnPressed();
//! set the voice room url fields (checkboxes, line edits)
//! Set the voice room url fields (checkboxes, line edits)
void ps_updateAudioVoiceRoomsFromContext(const BlackMisc::Audio::CVoiceRoomList &selectedVoiceRooms, bool connected);
private:
@@ -58,7 +58,6 @@ namespace BlackGui
//! Update voice room views
void updateVoiceRoomMembers();
QScopedPointer<Ui::CVoiceRoomsComponent> ui;
};