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

Updating main window because of recent changes (applying changes of other classes)

Browse Source
This commit is contained in:
Klaus Basan
2014-06-09 02:48:22 +02:00
parent 2325881c91
commit c99b340833
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackgui/mainwindow.cpp
View File

@@ -203,6 +203,8 @@ void MainWindow::toggleNetworkConnection()
// set latest aircraft // set latest aircraft
this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::sampleBlackGuiOriginator()); this->getIContextOwnAircraft()->updateOwnAircraft(this->m_ownAircraft, MainWindow::sampleBlackGuiOriginator());
// flight plan
this->ui->comp_Flightplan->prefillWithAircraftData(this->m_ownAircraft);
// Login is based on setting current server // Login is based on setting current server
INetwork::LoginMode mode = INetwork::LoginNormal; INetwork::LoginMode mode = INetwork::LoginNormal;

6
samples/blackgui/mainwindow.ui
View File

@@ -571,8 +571,8 @@ QStatusBar QLabel {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>326</width> <width>90</width>
<height>267</height> <height>59</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">
@@ -859,7 +859,7 @@ QStatusBar QLabel {
<item> <item>
<widget class="QTabWidget" name="tw_Settings"> <widget class="QTabWidget" name="tw_Settings">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork"> <widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title"> <attribute name="title">

6
samples/blackgui/mainwindow_settings.cpp
View File

@@ -4,6 +4,7 @@
#include "blackcore/dbus_server.h" #include "blackcore/dbus_server.h"
#include "blackcore/context_network.h" #include "blackcore/context_network.h"
#include "blackmisc/hwkeyboardkey.h" #include "blackmisc/hwkeyboardkey.h"
#include "blackmisc/setaudio.h"
using namespace BlackCore; using namespace BlackCore;
using namespace BlackMisc; using namespace BlackMisc;
@@ -21,6 +22,7 @@ void MainWindow::reloadSettings()
{ {
// local copy // local copy
CSettingsNetwork nws = this->getIContextSettings()->getNetworkSettings(); CSettingsNetwork nws = this->getIContextSettings()->getNetworkSettings();
CSettingsAudio as = this->getIContextSettings()->getAudioSettings();
// update servers // update servers
this->ui->tvp_SettingsTnServers->setSelectedServer(nws.getCurrentTrafficNetworkServer()); this->ui->tvp_SettingsTnServers->setSelectedServer(nws.getCurrentTrafficNetworkServer());
@@ -31,8 +33,8 @@ void MainWindow::reloadSettings()
// fake setting for sound notifications // fake setting for sound notifications
this->ui->cb_SettingsAudioPlayNotificationSounds->setChecked(true); this->ui->cb_SettingsAudioPlayNotificationSounds->setChecked(true);
this->ui->cb_SettingsAudioNotificationTextMessage->setChecked(true); this->ui->cb_SettingsAudioNotificationTextMessage->setChecked(as.getNotificationFlag(BlackSound::CNotificationSounds::NotificationTextMessagePrivate));
this->ui->cb_SettingsAudioNotificationVoiceRoom->setChecked(true); this->ui->cb_SettingsAudioNotificationVoiceRoom->setChecked(as.getNotificationFlag(BlackSound::CNotificationSounds::NotificationVoiceRoomJoined));
} }
/* /*