Ref T369, support for style in setting

This commit is contained in:
Klaus Basan
2018-09-23 03:36:11 +02:00
parent 4dce0fcee6
commit fec4643fc1
2 changed files with 26 additions and 24 deletions

View File

@@ -85,6 +85,7 @@ namespace BlackGui
case IndexPopupPrivateMessages: return CVariant::fromValue(this->popupPrivateMessages()); case IndexPopupPrivateMessages: return CVariant::fromValue(this->popupPrivateMessages());
case IndexPopupSupervisorMessages: return CVariant::fromValue(this->popupSupervisorMessages()); case IndexPopupSupervisorMessages: return CVariant::fromValue(this->popupSupervisorMessages());
case IndexPopupSelcalMessages: return CVariant::fromValue(this->popupSelcalMessages()); case IndexPopupSelcalMessages: return CVariant::fromValue(this->popupSelcalMessages());
case IndexStyle: return CVariant::fromValue(this->getStyleSheet());
default: return CValueObject::propertyByIndex(index); default: return CValueObject::propertyByIndex(index);
} }
} }
@@ -95,24 +96,13 @@ namespace BlackGui
const ColumnIndex i = index.frontCasted<ColumnIndex>(); const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i) switch (i)
{ {
case IndexPopupAllMessages: case IndexPopupAllMessages: this->setPopupAllMessages(variant.toBool()); break;
this->setPopupAllMessages(variant.toBool()); case IndexPopupFrequencyMessages: this->setPopupFrequencyMessages(variant.toBool()); break;
break; case IndexPopupSupervisorMessages: this->setSupervisorMessages(variant.toBool()); break;
case IndexPopupFrequencyMessages: case IndexPopupPrivateMessages: this->setPopupPrivateMessages(variant.toBool()); break;
this->setPopupFrequencyMessages(variant.toBool()); case IndexPopupSelcalMessages: this->setPopupSelcalMessages(variant.toBool()); break;
break; case IndexStyle: this->setStyleSheet(variant.toQString()); break;
case IndexPopupSupervisorMessages: default: CValueObject::setPropertyByIndex(index, variant); break;
this->setSupervisorMessages(variant.toBool());
break;
case IndexPopupPrivateMessages:
this->setPopupPrivateMessages(variant.toBool());
break;
case IndexPopupSelcalMessages:
this->setPopupSelcalMessages(variant.toBool());
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;
} }
} }
} // ns } // ns

View File

@@ -37,7 +37,8 @@ namespace BlackGui
IndexPopupSupervisorMessages, IndexPopupSupervisorMessages,
IndexPopupFrequencyMessages, IndexPopupFrequencyMessages,
IndexPopupAllMessages, IndexPopupAllMessages,
IndexPopupSelcalMessages IndexPopupSelcalMessages,
IndexStyle
}; };
//! Default constructor //! Default constructor
@@ -91,6 +92,15 @@ namespace BlackGui
//! Popup the given message? Complete check including frequencies. //! Popup the given message? Complete check including frequencies.
bool popup(const BlackMisc::Network::CTextMessage &textMessage, const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft) const; bool popup(const BlackMisc::Network::CTextMessage &textMessage, const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft) const;
//! CSS style sheet
const QString &getStyleSheet() const { return m_styleSheet; }
//! CSS style sheet
void setStyleSheet(const QString &styleSheet) { m_styleSheet = styleSheet; }
//! Reset style sheet
void resetStyleSheet() { m_styleSheet.clear(); }
//! \copydoc BlackMisc::Mixin::String::toQString //! \copydoc BlackMisc::Mixin::String::toQString
QString convertToQString(bool i18n = false) const; QString convertToQString(bool i18n = false) const;
@@ -101,11 +111,12 @@ namespace BlackGui
void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const BlackMisc::CVariant &variant); void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const BlackMisc::CVariant &variant);
private: private:
bool m_popupPrivateMessages = true; bool m_popupPrivateMessages = true;
bool m_popupSupervisorMessages = true; bool m_popupSupervisorMessages = true;
bool m_popupFrequencyMessages = false; //!< show if tuned in bool m_popupFrequencyMessages = false; //!< show if tuned in
bool m_popupAllMessages = false; bool m_popupAllMessages = false;
bool m_popupSelcalMessages = true; bool m_popupSelcalMessages = true;
QString m_styleSheet;
BLACK_METACLASS( BLACK_METACLASS(
CTextMessageSettings, CTextMessageSettings,
@@ -113,7 +124,8 @@ namespace BlackGui
BLACK_METAMEMBER(popupSupervisorMessages), BLACK_METAMEMBER(popupSupervisorMessages),
BLACK_METAMEMBER(popupFrequencyMessages), BLACK_METAMEMBER(popupFrequencyMessages),
BLACK_METAMEMBER(popupAllMessages), BLACK_METAMEMBER(popupAllMessages),
BLACK_METAMEMBER(popupSelcalMessages) BLACK_METAMEMBER(popupSelcalMessages),
BLACK_METAMEMBER(styleSheet)
); );
}; };