Commit 9b80720e authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Add/Edit marker/guide dialog: always show category color in combobox, always...

Add/Edit marker/guide dialog: always show category color in combobox, always use black font for guides/markers
parent 16928a5c
......@@ -43,9 +43,11 @@ MarkerDialog::MarkerDialog(ClipController *clip, const CommentedTime &t, const T
// Set up categories
static std::array<QColor, 9> markerTypes = pCore->projectManager()->getGuideModel()->markerTypes;
for (int i = 0; i < 9; ++i) {
marker_type->insertItem(i, i18n("Category %1", i));
marker_type->setItemData(i, markerTypes[size_t(i)], Qt::DecorationRole);
QPixmap pixmap(32,32);
for (uint i = 0; i < markerTypes.size(); ++i) {
pixmap.fill(markerTypes[size_t(i)]);
QIcon colorIcon(pixmap);
marker_type->addItem(colorIcon, i18n("Category %1", i));
}
marker_type->setCurrentIndex(t.markerType());
......
......@@ -565,12 +565,12 @@ Rectangle {
Text {
id: mlabel
text: model.comment
font.pixelSize: root.baseUnit
font: fixedFont
verticalAlignment: Text.AlignVCenter
anchors {
fill: parent
}
color: 'white'
color: '#000'
}
MouseArea {
z: 10
......
......@@ -510,7 +510,7 @@ Item {
background: Rectangle {
color: controller.markerColor
}
color: "#ffffff"
color: "#000"
padding: 0
maximumLength: 20
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment