Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 23:30:20 +01:00
Code Issues Projects Releases Wiki Activity

2021-10-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified various elements in rdairplay(1) so as to better respect
	platform styling hints.
	* Modified the marker readouts in rdlibrary(1) so as to better respect
	platform styling hints.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-10-22 13:38:46 -04:00
parent 90656ef63f
commit a5f7a957a1
6 changed files with 96 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rdlogmodel.cpp
View File

@@ -1655,7 +1655,7 @@ QColor RDLogModel::cellTextColor(int col,int line,RDLogLine *ll) const
return ll->groupColor();
}
return d_palette.color(QPalette::Foreground);
return RDGetTextColor(rowBackgroundColor(line,ll));
}

20
lib/rdmarkerreadout.cpp
View File

@@ -30,6 +30,14 @@ RDMarkerReadout::RDMarkerReadout(RDMarkerHandle::PointerRole role,
d_roles.push_back(role);
d_selected_marker=RDMarkerHandle::LastRole;
d_default_palette=palette();
d_selected_palette=palette();
d_selected_palette.
setColor(QPalette::Window,d_selected_palette.color(QPalette::Highlight));
d_selected_palette.
setColor(QPalette::WindowText,
d_selected_palette.color(QPalette::HighlightedText));
d_label=new QLabel(RDMarkerHandle::pointerRoleText(role),this);
d_label->setAlignment(Qt::AlignCenter);
d_label->setFont(labelFont());
@@ -44,6 +52,7 @@ RDMarkerReadout::RDMarkerReadout(RDMarkerHandle::PointerRole role,
d_edits.push_back(new QLabel(this));
d_edits.back()->setFrameShape(QFrame::Box);
d_edits.back()->setFrameShadow(QFrame::Sunken);
d_edits.back()->setFont(defaultFont());
d_edits.back()->setAlignment(Qt::AlignCenter);
d_edits.back()->setText("0:00:00");
}
@@ -55,6 +64,7 @@ RDMarkerReadout::RDMarkerReadout(RDMarkerHandle::PointerRole role,
d_edits.push_back(new QLabel(this));
d_edits.back()->setFrameShape(QFrame::Box);
d_edits.back()->setFrameShadow(QFrame::Sunken);
d_edits.back()->setFont(defaultFont());
d_edits.back()->setAlignment(Qt::AlignCenter);
d_edits.back()->setText("0:00:00");
}
@@ -155,13 +165,17 @@ void RDMarkerReadout::setSelectedMarkers(RDMarkerHandle::PointerRole start_role,
{
if(d_roles.contains(start_role)||d_roles.contains(end_role)) {
for(int i=0;i<d_edits.size();i++) {
d_edits.at(i)->setFont(labelFont());
d_edits.at(i)->setStyleSheet("background-color:#FFFF00");
d_edits.at(i)->setPalette(d_selected_palette);
d_edits.at(i)->
setStyleSheet("color:"+
d_selected_palette.color(QPalette::HighlightedText).name()+
";background-color:"+
d_selected_palette.color(QPalette::Window).name());
}
}
else {
for(int i=0;i<d_edits.size();i++) {
d_edits.at(i)->setFont(defaultFont());
d_edits.at(i)->setPalette(d_default_palette);
d_edits.at(i)->setStyleSheet("");
}
}

3
lib/rdmarkerreadout.h
View File

@@ -23,6 +23,7 @@
#include <QLabel>
#include <QList>
#include <QPalette>
#include <rdmarkerview.h>
#include <rdpushbutton.h>
@@ -52,6 +53,8 @@ class RDMarkerReadout : public RDPushButton
QList<RDMarkerHandle::PointerRole> d_roles;
RDMarkerHandle::PointerRole d_selected_marker;
int d_pointers[RDMarkerHandle::LastRole];
QPalette d_default_palette;
QPalette d_selected_palette;
};