From bf6c847f1e7c166f7094937bfb946c4cb0227c37 Mon Sep 17 00:00:00 2001
From: manongjohn <manongjohn@users.noreply.github.com>
Date: May 28 2018 05:17:36 +0000
Subject: Alternate Timecode format (#1995)


close #1784 
---

diff --git a/toonz/sources/stdfx/iwa_timecodefx.cpp b/toonz/sources/stdfx/iwa_timecodefx.cpp
index 21f7dc5..700d6c3 100644
--- a/toonz/sources/stdfx/iwa_timecodefx.cpp
+++ b/toonz/sources/stdfx/iwa_timecodefx.cpp
@@ -17,6 +17,7 @@ Iwa_TimeCodeFx::Iwa_TimeCodeFx()
     , m_textColor(TPixel32::White)
     , m_showBox(true)
     , m_boxColor(TPixel32::Black) {
+  m_displayType->addItem(TYPE_HHMMSSFF2, "HH:MM:SS:FF");
   m_displayType->addItem(TYPE_FRAME, "Frame Number");
   m_position->getX()->setMeasureName("fxLength");
   m_position->getY()->setMeasureName("fxLength");
@@ -122,7 +123,9 @@ QString Iwa_TimeCodeFx::getTimeCodeStr(double frame,
                                        const TRenderSettings &ri) {
   int f = (int)frame + m_startFrame->getValue();
 
-  if (m_displayType->getValue() == TYPE_HHMMSSFF) {
+  if (m_displayType->getValue() != TYPE_FRAME) {
+    QString separator =
+        (m_displayType->getValue() == TYPE_HHMMSSFF ? ";" : ":");
     bool neg = (f < 0);
     f        = abs(f);
     int fps  = m_frameRate->getValue();
@@ -133,9 +136,9 @@ QString Iwa_TimeCodeFx::getTimeCodeStr(double frame,
     int ss = f / fps;
     int ff = f % fps;
     return QString((neg) ? "-" : "") +
-           QString::number(hh).rightJustified(2, '0') + QString(";") +
-           QString::number(mm).rightJustified(2, '0') + QString(";") +
-           QString::number(ss).rightJustified(2, '0') + QString(";") +
+           QString::number(hh).rightJustified(2, '0') + separator +
+           QString::number(mm).rightJustified(2, '0') + separator +
+           QString::number(ss).rightJustified(2, '0') + separator +
            QString::number(ff).rightJustified(2, '0');
   } else {   // TYPE_FRAMENUMBER
     f += 1;  // starting from "000001" with no frame offset.
diff --git a/toonz/sources/stdfx/iwa_timecodefx.h b/toonz/sources/stdfx/iwa_timecodefx.h
index a62c08b..570aff1 100644
--- a/toonz/sources/stdfx/iwa_timecodefx.h
+++ b/toonz/sources/stdfx/iwa_timecodefx.h
@@ -31,7 +31,7 @@ public:
   void putTimeCodeImage(const RASTER srcRas, TPoint &pos, QImage &img);
 
 public:
-  enum { TYPE_HHMMSSFF, TYPE_FRAME };
+  enum { TYPE_HHMMSSFF, TYPE_FRAME, TYPE_HHMMSSFF2 };
 
   Iwa_TimeCodeFx();