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

refs #697, BlackGui settings renamed

Browse Source
This commit is contained in:
Klaus Basan
2016-08-01 15:37:42 +02:00
parent 8013a6ac9c
commit 862a84b661
12 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
#include "blackcore/settings/network.h"
#include "blackcore/data/vatsimsetup.h"
#include "blackgui/blackguiexport.h"
#include "blackgui/settings/settingsgui.h"
#include "blackgui/settings/guisettings.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/network/entityflags.h"
#include "blackmisc/network/server.h"
@@ -166,7 +166,7 @@ namespace BlackGui
const int LogoffIntervalSeconds = 10;
QTimer *m_logoffCountdownTimer { nullptr };
BlackMisc::CSettingReadOnly<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackGui::Settings::OwnAircraftModel> m_currentAircraftModel { this };
BlackMisc::CSetting<BlackGui::Settings::TOwnAircraftModel> m_currentAircraftModel { this };
BlackMisc::CData<BlackCore::Data::VatsimCurrentServer> m_currentVatsimServer { this };
};
} // namespace

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

@@ -118,7 +118,7 @@ namespace BlackGui
void CNavigatorDialog::restoreFromSettings()
{
const CSettingsNavigator s = this->m_settings.get();
const CNavigatorSettings s = this->m_settings.get();
this->setContentsMargins(s.getMargins());
if (this->isFrameless() != s.isFramless()) { this->toggleFrameless(); }
this->buildNavigator(s.getColumns());
@@ -128,7 +128,7 @@ namespace BlackGui
void CNavigatorDialog::saveToSettings()
{
CSettingsNavigator s = this->m_settings.get();
CNavigatorSettings s = this->m_settings.get();
s.setFrameless(this->isFrameless());
s.setMargins(this->contentsMargins());
s.setGeometry(this->saveGeometry());

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

@@ -14,7 +14,7 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/enableforframelesswindow.h"
#include "blackgui/settings/settingsnavigator.h"
#include "blackgui/settings/navigatorsettings.h"
#include <QDialog>
#include <QObject>
@@ -118,7 +118,7 @@ namespace BlackGui
int m_currentColumns = 1;
QWidgetAction *m_marginMenuAction = nullptr; //!< menu widget(!) action for margin widget
CMarginsInput *m_input = nullptr; //!< margins widget
BlackMisc::CSetting<BlackGui::Settings::SettingsNavigator> m_settings { this, &CNavigatorDialog::ps_settingsChanged };
BlackMisc::CSetting<BlackGui::Settings::TNavigator> m_settings { this, &CNavigatorDialog::ps_settingsChanged };
};
} // ns
} // ns