refs #799, some minor adjustments

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

View File

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

View File

@@ -235,7 +235,7 @@ namespace BlackGui
bool m_selected = false; //!< selected when tabbed
bool m_dockWidgetVisible = false; //!< logical visible, not to be confused with QDockWidget::isVisible()
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
void initTitleBarWidgets();

View File

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

View File

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