Overlay text message focus setting

This commit is contained in:
Klaus Basan
2019-05-20 01:14:46 +02:00
parent 31e28a638e
commit be4a9ee8ae
5 changed files with 66 additions and 35 deletions

View File

@@ -64,11 +64,12 @@ namespace BlackGui
QString CTextMessageSettings::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return QStringLiteral("Private: %1 supervisor: %2 frequency: %3 all: %4").arg(
return QStringLiteral("Private: %1 supervisor: %2 frequency: %3 all: %4 focus: %5").arg(
boolToOnOff(this->getPopupPrivateMessages()),
boolToOnOff(this->getPopupSupervisorMessages()),
boolToOnOff(this->getPopupFrequencyMessages()),
boolToOnOff(this->getPopupAllMessages())
boolToOnOff(this->getPopupAllMessages()),
boolToYesNo(this->focusOverlayWindow())
);
}
@@ -78,12 +79,13 @@ namespace BlackGui
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexPopupAllMessages: return CVariant::fromValue(this->getPopupAllMessages());
case IndexPopupFrequencyMessages: return CVariant::fromValue(this->popupFrequencyMessages());
case IndexPopupPrivateMessages: return CVariant::fromValue(this->popupPrivateMessages());
case IndexPopupAllMessages: return CVariant::fromValue(this->getPopupAllMessages());
case IndexPopupFrequencyMessages: return CVariant::fromValue(this->popupFrequencyMessages());
case IndexPopupPrivateMessages: return CVariant::fromValue(this->popupPrivateMessages());
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());
case IndexFocus: return CVariant::fromValue(this->focusOverlayWindow());
default: return CValueObject::propertyByIndex(index);
}
}
@@ -94,11 +96,12 @@ namespace BlackGui
const ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexPopupAllMessages: this->setPopupAllMessages(variant.toBool()); break;
case IndexPopupFrequencyMessages: this->setPopupFrequencyMessages(variant.toBool()); break;
case IndexPopupSupervisorMessages: this->setSupervisorMessages(variant.toBool()); break;
case IndexPopupPrivateMessages: this->setPopupPrivateMessages(variant.toBool()); break;
case IndexPopupSelcalMessages: this->setPopupSelcalMessages(variant.toBool()); break;
case IndexPopupAllMessages: this->setPopupAllMessages(variant.toBool()); break;
case IndexPopupFrequencyMessages: this->setPopupFrequencyMessages(variant.toBool()); break;
case IndexPopupSupervisorMessages: this->setSupervisorMessages(variant.toBool()); break;
case IndexPopupPrivateMessages: this->setPopupPrivateMessages(variant.toBool()); break;
case IndexPopupSelcalMessages: this->setPopupSelcalMessages(variant.toBool()); break;
case IndexFocus: this->setFocusOverlayWindows(variant.toBool()); break;
case IndexStyle: this->setStyleSheet(variant.toQString()); break;
default: CValueObject::setPropertyByIndex(index, variant); break;
}

View File

@@ -37,6 +37,7 @@ namespace BlackGui
IndexPopupFrequencyMessages,
IndexPopupAllMessages,
IndexPopupSelcalMessages,
IndexFocus,
IndexStyle
};
@@ -97,6 +98,12 @@ namespace BlackGui
//! CSS style sheet
void setStyleSheet(const QString &styleSheet) { m_styleSheet = styleSheet; }
//! Focus in the overlay window
bool focusOverlayWindow() const { return m_focus; }
//! Set focus in overlay window
void setFocusOverlayWindows(bool focus) { m_focus = focus; }
//! Reset style sheet
void resetStyleSheet() { m_styleSheet.clear(); }
@@ -115,6 +122,7 @@ namespace BlackGui
bool m_popupFrequencyMessages = false; //!< show if tuned in
bool m_popupAllMessages = false;
bool m_popupSelcalMessages = true;
bool m_focus = true;
QString m_styleSheet;
BLACK_METACLASS(