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

refs #799, some minor adjustments

Browse Source
This commit is contained in:
Klaus Basan
2016-11-09 20:17:31 +01:00
parent 438e72555a
commit 82995ab690
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/components/settingsguicomponent.cpp
View File

@@ -71,9 +71,9 @@ namespace BlackGui
void CSettingsGuiComponent::ps_fontChanged() void CSettingsGuiComponent::ps_fontChanged()
{ {
QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt"); const QString fontSize = ui->cb_SettingsGuiFontSize->currentText().append("pt");
QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family(); const QString fontFamily = ui->cb_SettingsGuiFont->currentFont().family();
QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText(); const QString fontStyleCombined = ui->cb_SettingsGuiFontStyle->currentText();
QString fontColor = this->m_fontColor.name(); QString fontColor = this->m_fontColor.name();
if (!this->m_fontColor.isValid() || this->m_fontColor.name().isEmpty()) if (!this->m_fontColor.isValid() || this->m_fontColor.name().isEmpty())
{ {

2
src/blackgui/dockwidget.h
View File

@@ -235,7 +235,7 @@ namespace BlackGui
bool m_selected = false; //!< selected when tabbed bool m_selected = false; //!< selected when tabbed
bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible() bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible()
bool m_wasFrameless = false; //!< frameless when last floating bool m_wasFrameless = false; //!< frameless when last floating
BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::ps_settingsChanged }; //!< all docked wigets settings BlackMisc::CSetting<BlackGui::Settings::TDockWidget> m_settings { this, &CDockWidget::ps_settingsChanged };
//! Empty widget with no size //! Empty widget with no size
void initTitleBarWidgets(); void initTitleBarWidgets();

2
src/blackgui/settings/navigatorsettings.h
View File

@@ -25,7 +25,7 @@ namespace BlackGui
{ {
namespace Settings namespace Settings
{ {
//! Settings for dockwidget //! Settings for navigator bar
class BLACKGUI_EXPORT CNavigatorSettings : class BLACKGUI_EXPORT CNavigatorSettings :
public BlackMisc::CValueObject<CNavigatorSettings> public BlackMisc::CValueObject<CNavigatorSettings>
{ {

2
src/swiftguistandard/swiftguistdinit.cpp
View File

@@ -219,7 +219,7 @@ void SwiftGuiStd::initGuiSignals()
connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings, ui->comp_MainInfoArea->getFlightPlanComponent(), [ = ]() connect(ui->comp_Login, &CLoginComponent::requestNetworkSettings, ui->comp_MainInfoArea->getFlightPlanComponent(), [ = ]()
{ {
this->ps_setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings); this->ps_setMainPageInfoArea(CMainInfoAreaComponent::InfoAreaSettings);
ui->comp_MainInfoArea->getSettingsComponent()->setSettingsTab(CSettingsComponent::SettingTabNetworkServers); ui->comp_MainInfoArea->getSettingsComponent()->setSettingsTab(CSettingsComponent::SettingTabNetwork);
}); });
// text messages // text messages