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

src/dialogs/markerdialog.cpp

@@ -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());
 

src/monitor/view/MonitorRuler.qml

@@ -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

src/monitor/view/kdenliveclipmonitor.qml

@@ -510,7 +510,7 @@ Item {
                 background: Rectangle {
                     color: controller.markerColor
                 }
-                color: "#ffffff"
+                color: "#000"
                 padding: 0
                 maximumLength: 20
             }