From c99b340833be30ea5fa262bbc7b7e4ee4619e9a0 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 9 Jun 2014 02:48:22 +0200
Subject: [PATCH] Updating main window because of recent changes (applying
 changes of other classes)

---
 samples/blackgui/mainwindow.cpp          | 2 ++
 samples/blackgui/mainwindow.ui           | 6 +++---
 samples/blackgui/mainwindow_settings.cpp | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/samples/blackgui/mainwindow.cpp b/samples/blackgui/mainwindow.cpp
index aa01b81fe..a0155f6ab 100644
--- a/samples/blackgui/mainwindow.cpp
+++ b/samples/blackgui/mainwindow.cpp
@@ -203,6 +203,8 @@ void MainWindow::toggleNetworkConnection()
         // set latest aircraft
         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
         INetwork::LoginMode mode = INetwork::LoginNormal;
diff --git a/samples/blackgui/mainwindow.ui b/samples/blackgui/mainwindow.ui
index a9c823006..7f39f7e8a 100644
--- a/samples/blackgui/mainwindow.ui
+++ b/samples/blackgui/mainwindow.ui
@@ -571,8 +571,8 @@ QStatusBar QLabel {
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>326</width>
-                <height>267</height>
+                <width>90</width>
+                <height>59</height>
                </rect>
               </property>
               <attribute name="label">
@@ -859,7 +859,7 @@ QStatusBar QLabel {
            <item>
             <widget class="QTabWidget" name="tw_Settings">
              <property name="currentIndex">
-              <number>2</number>
+              <number>1</number>
              </property>
              <widget class="QWidget" name="tb_SettingsTrafficNetwork">
               <attribute name="title">
diff --git a/samples/blackgui/mainwindow_settings.cpp b/samples/blackgui/mainwindow_settings.cpp
index 9b4f04169..9e9161abe 100644
--- a/samples/blackgui/mainwindow_settings.cpp
+++ b/samples/blackgui/mainwindow_settings.cpp
@@ -4,6 +4,7 @@
 #include "blackcore/dbus_server.h"
 #include "blackcore/context_network.h"
 #include "blackmisc/hwkeyboardkey.h"
+#include "blackmisc/setaudio.h"
 
 using namespace BlackCore;
 using namespace BlackMisc;
@@ -21,6 +22,7 @@ void MainWindow::reloadSettings()
 {
     // local copy
     CSettingsNetwork nws = this->getIContextSettings()->getNetworkSettings();
+    CSettingsAudio as = this->getIContextSettings()->getAudioSettings();
 
     // update servers
     this->ui->tvp_SettingsTnServers->setSelectedServer(nws.getCurrentTrafficNetworkServer());
@@ -31,8 +33,8 @@ void MainWindow::reloadSettings()
 
     // fake setting for sound notifications
     this->ui->cb_SettingsAudioPlayNotificationSounds->setChecked(true);
-    this->ui->cb_SettingsAudioNotificationTextMessage->setChecked(true);
-    this->ui->cb_SettingsAudioNotificationVoiceRoom->setChecked(true);
+    this->ui->cb_SettingsAudioNotificationTextMessage->setChecked(as.getNotificationFlag(BlackSound::CNotificationSounds::NotificationTextMessagePrivate));
+    this->ui->cb_SettingsAudioNotificationVoiceRoom->setChecked(as.getNotificationFlag(BlackSound::CNotificationSounds::NotificationVoiceRoomJoined));
 }
 
 /*