Add default marker color to config

app/config/config.cpp

@@ -134,6 +134,8 @@ void Config::SetDefaults()
   // Online/offline settings
   SetEntryInternal(QStringLiteral("OnlinePixelFormat"), NodeValue::kInt, VideoParams::kFormatFloat32);
   SetEntryInternal(QStringLiteral("OfflinePixelFormat"), NodeValue::kInt, VideoParams::kFormatFloat16);
+
+  SetEntryInternal(QStringLiteral("MarkerColor"), NodeValue::kInt, ColorCoding::kRed);
 }
 
 void Config::Load()

app/dialog/preferences/tabs/preferencesappearancetab.cpp

@@ -82,6 +82,22 @@ PreferencesAppearanceTab::PreferencesAppearanceTab()
     appearance_layout->addWidget(color_group, row, 0, 1, 2);
   }
 
+  row++;
+  {
+    QGroupBox* marker_group = new QGroupBox();
+    marker_group->setTitle(tr("Default Marker Color"));
+
+    QGridLayout* marker_layout = new QGridLayout(marker_group);
+
+    marker_layout->addWidget(new QLabel("Marker"), 0, 0);
+
+    marker_btn_ = new ColorCodingComboBox();
+    marker_btn_->SetColor(Config::Current()[QStringLiteral("MarkerColor")].toInt());
+    marker_layout->addWidget(marker_btn_, 0, 1);
+
+    appearance_layout->addWidget(marker_group, row, 0, 1, 2);
+  }
+
   layout->addStretch();
 }
 
@@ -99,6 +115,8 @@ void PreferencesAppearanceTab::Accept(MultiUndoCommand *command)
   for (int i=0; i<color_btns_.size(); i++) {
     Config::Current()[QStringLiteral("CatColor%1").arg(i)] = color_btns_.at(i)->GetSelectedColor();
   }
+
+  Config::Current()[QStringLiteral("MarkerColor")] = marker_btn_->GetSelectedColor();
 }
 
 }

app/dialog/preferences/tabs/preferencesappearancetab.h

@@ -47,6 +47,8 @@ private:
 
   QVector<ColorCodingComboBox*> color_btns_;
 
+  ColorCodingComboBox* marker_btn_;
+
 };
 
 }

app/timeline/timelinemarker.cpp

@@ -21,15 +21,16 @@
 #include "timelinemarker.h"
 
 #include "common/xmlutils.h"
+#include "config/config.h"
 
 namespace olive {
 
 TimelineMarker::TimelineMarker(const TimeRange &time, const QString &name, QObject *parent) :
   QObject(parent),
   time_(time),
-  name_(name),
-  color_(7) // FIXME: set via config
+  name_(name)
 {
+  color_ = Config::Current()[QStringLiteral("MarkerColor")].toInt();
 }
 
 const TimeRange &TimelineMarker::time() const

app/widget/marker/marker.cpp

@@ -23,6 +23,7 @@
 #include <QPainter>
 
 #include "common/qtutils.h"
+#include "config/config.h"
 #include "ui/colorcoding.h"
 #include "widget/menu/menu.h"
 #include "widget/menu/menushared.h"
@@ -33,7 +34,6 @@ namespace olive {
 
 Marker::Marker(QWidget *parent) :
 	QWidget(parent),
-    marker_color_(7), //green FIXME: add default color to config
     active_(false)
 {
   //setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);