mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-12-16 17:13:58 -05:00
Replaced deprecated QColorDialog::getRgba by QColorDialog::getColor
This commit is contained in:
parent
990f4dbf09
commit
bdae3b35b4
3 changed files with 9 additions and 12 deletions
|
|
@ -1507,10 +1507,9 @@ void ChatWidget::on_markButton_clicked(bool bValue)
|
||||||
|
|
||||||
void ChatWidget::chooseColor()
|
void ChatWidget::chooseColor()
|
||||||
{
|
{
|
||||||
bool ok;
|
QColor color = QColorDialog::getColor(currentColor, window(), "", QColorDialog::ShowAlphaChannel);
|
||||||
QRgb color = QColorDialog::getRgba(currentColor.rgba(), &ok, window());
|
if (color.isValid()) {
|
||||||
if (ok) {
|
currentColor = color;
|
||||||
currentColor = QColor(color);
|
|
||||||
PeerSettings->setPrivateChatColor(chatId, currentColor.name());
|
PeerSettings->setPrivateChatColor(chatId, currentColor.name());
|
||||||
colorChanged();
|
colorChanged();
|
||||||
setColorAndFont(false);
|
setColorAndFont(false);
|
||||||
|
|
|
||||||
|
|
@ -686,10 +686,9 @@ void ChatPage::on_cbSearch_WithoutLimit_toggled(bool checked)
|
||||||
|
|
||||||
void ChatPage::on_btSearch_FoundColor_clicked()
|
void ChatPage::on_btSearch_FoundColor_clicked()
|
||||||
{
|
{
|
||||||
bool ok;
|
QColor color = QColorDialog::getColor(QColor::fromRgba(rgbChatSearchFoundColor), window(), "", QColorDialog::ShowAlphaChannel);
|
||||||
QRgb color = QColorDialog::getRgba(rgbChatSearchFoundColor, &ok, window());
|
if (color.isValid()) {
|
||||||
if (ok) {
|
rgbChatSearchFoundColor = color.rgba();
|
||||||
rgbChatSearchFoundColor=color;
|
|
||||||
QPixmap pix(24, 24);
|
QPixmap pix(24, 24);
|
||||||
pix.fill(color);
|
pix.fill(color);
|
||||||
ui.btSearch_FoundColor->setIcon(pix);
|
ui.btSearch_FoundColor->setIcon(pix);
|
||||||
|
|
|
||||||
|
|
@ -123,10 +123,9 @@ void NewTag::textChanged(const QString &text)
|
||||||
|
|
||||||
void NewTag::setTagColor()
|
void NewTag::setTagColor()
|
||||||
{
|
{
|
||||||
bool ok;
|
QColor color = QColorDialog::getColor(QColor::fromRgba(m_Color), this, "", QColorDialog::ShowAlphaChannel);
|
||||||
QRgb color = QColorDialog::getRgba(m_Color, &ok, this);
|
if (color.isValid()) {
|
||||||
if (ok) {
|
m_Color = color.rgba();
|
||||||
m_Color = color;
|
|
||||||
showColor (m_Color);
|
showColor (m_Color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue