Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-18 08:31:16 +02:00
Code Issues Projects Releases Wiki Activity

2021-08-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed regressions in rdlogmanager(1) that caused the 'Color'
	setting for Events and Clocks to fail to be saved.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-15 15:16:59 -04:00
parent fcb3ad7b27
commit b2adad3a32
7 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rdlogmanager/edit_clock.cpp
View File

@@ -190,7 +190,8 @@ EditClock::EditClock(QString clockname,bool new_clock,
edit_color_button->setFont(buttonFont());
edit_color_button->setText(tr("Color"));
connect(edit_color_button,SIGNAL(clicked()),this,SLOT(colorData()));
edit_color=palette().color(QPalette::Background);
//
// Clock Display
//
@@ -226,6 +227,7 @@ EditClock::EditClock(QString clockname,bool new_clock,
edit_clocks_model->load();
edit_shortname_edit->setText(edit_clocks_model->shortName());
if(edit_clocks_model->color().isValid()) {
edit_color=edit_clocks_model->color();
edit_color_button->
setPalette(QPalette(edit_clocks_model->color(),palette().color(QPalette::Background)));
}
@@ -501,6 +503,7 @@ void EditClock::colorData()
QColor color=
QColorDialog::getColor(edit_color_button->palette().color(QPalette::Background),this);
if(color.isValid()) {
edit_color=color;
edit_color_button->setPalette(QPalette(color,palette().color(QPalette::Background)));
}
}
@@ -576,7 +579,7 @@ void EditClock::closeEvent(QCloseEvent *e)
void EditClock::Save()
{
edit_clocks_model->setColor(edit_color_button->palette().color(QPalette::Background));
edit_clocks_model->setColor(edit_color);
edit_clocks_model->setShortName(edit_shortname_edit->text());
edit_clocks_model->setRemarks(edit_remarks_edit->toPlainText());
edit_clocks_model->save();