diff options
Diffstat (limited to 'src/Authoring/Studio/Palettes/TimelineGraphicsView/ui')
5 files changed, 36 insertions, 31 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/PlayHead.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/PlayHead.cpp index 769b52bd..35787462 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/PlayHead.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/PlayHead.cpp @@ -29,6 +29,7 @@ #include "PlayHead.h" #include "Ruler.h" #include "TimelineConstants.h" +#include "StudioPreferences.h" #include <QtGui/qpainter.h> #include <QtGui/qcursor.h> @@ -50,7 +51,7 @@ void PlayHead::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, static const int PLAY_HEAD_H = 999999; // theoretically big enough height painter->drawPixmap(-TimelineConstants::PLAYHEAD_W * .5, 0, pixHead); - painter->setPen(QColor(TimelineConstants::PLAYHEAD_LINE_COLOR)); + painter->setPen(CStudioPreferences::timelinePlayheadLineColor()); painter->drawLine(0, 0, 0, PLAY_HEAD_H); } diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp index 18b309ce..60583eb2 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTimeline.cpp @@ -39,6 +39,7 @@ #include "Bindings/ITimelineTimebar.h" #include "Bindings/Qt3DSDMTimelineItemProperty.h" #include "AppFonts.h" +#include "StudioPreferences.h" #include <QtGui/qpainter.h> #include <QtGui/qbrush.h> @@ -83,13 +84,13 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio // Background QColor bgColor; if (m_rowTree->isProperty()) - bgColor = TimelineConstants::ROW_COLOR_NORMAL_PROP; + bgColor = CStudioPreferences::timelineRowColorNormalProp(); else if (m_state == Selected) - bgColor = TimelineConstants::ROW_COLOR_SELECTED; + bgColor = CStudioPreferences::timelineRowColorSelected(); else if (m_state == Hovered && !m_rowTree->m_locked) - bgColor = TimelineConstants::ROW_COLOR_OVER; + bgColor = CStudioPreferences::timelineRowColorOver(); else - bgColor = TimelineConstants::ROW_COLOR_NORMAL; + bgColor = CStudioPreferences::timelineRowColorNormal(); painter->fillRect(0, 0, size().width(), currentHeight, bgColor); } @@ -100,14 +101,14 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio // fully outside ancestors' limits, draw fully hashed if (m_minStartX > m_endX || m_maxEndX < m_startX) { - painter->setBrush(QBrush(QColor(TimelineConstants::ROW_COLOR_DURATION_OFF1), + painter->setBrush(QBrush(CStudioPreferences::timelineRowColorDurationOff1(), Qt::BDiagPattern)); painter->setPen(Qt::NoPen); painter->fillRect(QRect(m_startX, 0, m_endX - m_startX, currentHeight), - QColor(TimelineConstants::ROW_COLOR_DURATION_OFF2)); + CStudioPreferences::timelineRowColorDurationOff2()); painter->drawRect(QRect(m_startX, 0, m_endX - m_startX, currentHeight)); - painter->setPen(QPen(QColor(TimelineConstants::ROW_COLOR_DURATION_EDGE), 3)); + painter->setPen(QPen(CStudioPreferences::timelineRowColorDurationEdge(), 2)); painter->drawLine(m_startX, 0, m_startX, currentHeight); painter->drawLine(m_endX, 0, m_endX, currentHeight); } else { @@ -120,7 +121,7 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio if (m_controllerDataInput.size()) { painter->fillRect(QRect(x, 0, w, currentHeight), - QColor(TimelineConstants::ROW_COLOR_DATAINPUT_DURATION)); + CStudioPreferences::dataInputColor()); } else if (m_rowTree->indexInLayout() != 1) { painter->fillRect(QRect(x, 0, w, currentHeight), m_barColor); } @@ -128,7 +129,7 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio if (m_state == Selected) { // draw selection overlay on bar painter->fillRect(QRect(x, marginY, w, currentHeight - marginY * 2), - QColor(TimelineConstants::ROW_COLOR_DURATION_SELECTED)); + CStudioPreferences::timelineRowColorDurationSelected()); } if (m_controllerDataInput.size()) { @@ -141,7 +142,7 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio // for text painter->setClipRect(x, 0, w, currentHeight); painter->setClipping(true); - painter->setPen(QPen(QColor(TimelineConstants::ROW_COLOR_DATAINPUT_TEXT), 2)); + painter->setPen(QPen(CStudioPreferences::textColor(), 2)); painter->drawText(QRect(x + pixDataInput.width(), 0, w, currentHeight), m_controllerDataInput, QTextOption(Qt::AlignCenter)); // place the icon marginY amount away from the datainput name @@ -156,14 +157,14 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio } // draw hashed part before - painter->setBrush(QBrush(QColor(TimelineConstants::ROW_COLOR_DURATION_OFF1), + painter->setBrush(QBrush(CStudioPreferences::timelineRowColorDurationOff1(), Qt::BDiagPattern)); if (m_startX < m_minStartX) { painter->setPen(Qt::NoPen); painter->fillRect(QRect(m_startX, 0, m_minStartX - m_startX, currentHeight), - QColor(TimelineConstants::ROW_COLOR_DURATION_OFF2)); + CStudioPreferences::timelineRowColorDurationOff2()); painter->drawRect(QRect(m_startX, 0, m_minStartX - m_startX, currentHeight)); - painter->setPen(QColor(TimelineConstants::ROW_COLOR_DURATION_EDGE)); + painter->setPen(CStudioPreferences::timelineRowColorDurationEdge()); painter->drawLine(m_minStartX, 0, m_minStartX, currentHeight); } @@ -171,14 +172,14 @@ void RowTimeline::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio if (m_endX > m_maxEndX) { painter->setPen(Qt::NoPen); painter->fillRect(QRect(m_maxEndX, 0, m_endX - m_maxEndX, currentHeight), - QColor(TimelineConstants::ROW_COLOR_DURATION_OFF2)); + CStudioPreferences::timelineRowColorDurationOff2()); painter->drawRect(QRect(m_maxEndX, 0, m_endX - m_maxEndX, currentHeight)); - painter->setPen(QColor(TimelineConstants::ROW_COLOR_DURATION_EDGE)); + painter->setPen(CStudioPreferences::timelineRowColorDurationEdge()); painter->drawLine(m_maxEndX, 0, m_maxEndX, currentHeight); } if (m_rowTree->indexInLayout() != 1) { - painter->setPen(QPen(QColor(TimelineConstants::ROW_COLOR_DURATION_EDGE), 2)); + painter->setPen(QPen(CStudioPreferences::timelineRowColorDurationEdge(), 2)); painter->drawLine(m_startX, 0, m_startX, currentHeight); painter->drawLine(m_endX, 0, m_endX, currentHeight); } diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp index 7d330da3..8a0360c1 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/RowTree.cpp @@ -36,6 +36,7 @@ #include "Bindings/Qt3DSDMTimelineItemBinding.h" #include "Qt3DSString.h" #include "TreeHeader.h" +#include "StudioPreferences.h" #include <QtGui/qpainter.h> #include "QtGui/qtextcursor.h" @@ -190,28 +191,28 @@ void RowTree::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q // Background QColor bgColor; if (m_dndState == DnDState::Source) - bgColor = TimelineConstants::ROW_COLOR_DND_SRC; + bgColor = CStudioPreferences::timelineRowColorDndSource(); else if (m_isProperty) - bgColor = TimelineConstants::ROW_COLOR_NORMAL_PROP; + bgColor = CStudioPreferences::timelineRowColorNormalProp(); else if (m_dndHover) - bgColor = TimelineConstants::ROW_COLOR_DND_TGT; + bgColor = CStudioPreferences::timelineRowColorDndTarget(); else if (m_state == Selected) - bgColor = TimelineConstants::ROW_COLOR_SELECTED; + bgColor = CStudioPreferences::timelineRowColorSelected(); else if (m_state == Hovered && !m_locked) - bgColor = TimelineConstants::ROW_COLOR_OVER; + bgColor = CStudioPreferences::timelineRowColorOver(); else - bgColor = TimelineConstants::ROW_COLOR_NORMAL; + bgColor = CStudioPreferences::timelineRowColorNormal(); painter->fillRect(QRect(0, 0, size().width(), size().height() - 1), bgColor); // left divider - painter->setPen(TimelineConstants::WIDGET_BG_COLOR); + painter->setPen(CStudioPreferences::timelineWidgetBgColor()); painter->drawLine(18, 0, 18, size().height() - 1); // Shy, eye, lock separator painter->fillRect(QRect(treeWidth() - TimelineConstants::TREE_ICONS_W, 0, 1, size().height()), - TimelineConstants::WIDGET_BG_COLOR); + CStudioPreferences::timelineWidgetBgColor()); // Shy, eye, lock static const QPixmap pixEmpty = QPixmap(":/images/Toggle-Empty.png"); @@ -226,7 +227,7 @@ void RowTree::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q // Candidate parent of a dragged row if (m_dndState == DnDState::Parent) { - painter->setPen(QPen(QColor(TimelineConstants::ROW_MOVER_COLOR), 1)); + painter->setPen(QPen(CStudioPreferences::timelineRowMoverColor(), 1)); painter->drawRect(QRect(1, 1, treeWidth() - 2, size().height() - 3)); } diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/Ruler.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/Ruler.cpp index be0cb878..84e8a74e 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/Ruler.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/Ruler.cpp @@ -28,6 +28,7 @@ #include "Ruler.h" #include "TimelineConstants.h" +#include "StudioPreferences.h" #include <QtGui/qpainter.h> #include <QtWidgets/qwidget.h> @@ -53,12 +54,12 @@ void Ruler::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi double rowXMax = std::max(minRulerWidth, totalSegmentsWidth); painter->save(); - painter->setPen(QColor(TimelineConstants::RULER_COLOR_DISABLED)); + painter->setPen(CStudioPreferences::timelineRulerColorDisabled()); painter->drawLine(TimelineConstants::RULER_EDGE_OFFSET, TimelineConstants::RULER_BASE_Y, rowXMax + TimelineConstants::RULER_EDGE_OFFSET, TimelineConstants::RULER_BASE_Y); - painter->setPen(QColor(TimelineConstants::RULER_COLOR)); + painter->setPen(CStudioPreferences::timelineRulerColor()); painter->drawLine(TimelineConstants::RULER_EDGE_OFFSET, TimelineConstants::RULER_BASE_Y, activeSegmentsWidth, @@ -84,7 +85,7 @@ void Ruler::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWi TimelineConstants::RULER_DIV_H3; if (!useDisabledColor && rowX > activeSegmentsWidth) { - painter->setPen(QColor(TimelineConstants::RULER_COLOR_DISABLED)); + painter->setPen(CStudioPreferences::timelineRulerColorDisabled()); useDisabledColor = true; } painter->drawLine(QPointF(rowX, TimelineConstants::RULER_BASE_Y - h), diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TreeHeader.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TreeHeader.cpp index 6f597cd9..54fced3d 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TreeHeader.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/ui/TreeHeader.cpp @@ -27,6 +27,7 @@ ****************************************************************************/ #include "TreeHeader.h" +#include "StudioPreferences.h" #include <QtGui/qpainter.h> @@ -53,8 +54,8 @@ void TreeHeader::paint(QPainter *painter, const QStyleOptionGraphicsItem *option static const QPixmap pixVisible = QPixmap(":/images/Toggle-HideShow.png"); static const QPixmap pixLock = QPixmap(":/images/Toggle-Lock.png"); - QColor selectedColor = QColor(TimelineConstants::FILTER_BUTTON_SELECTED_COLOR); - QColor hoveredColor = QColor(TimelineConstants::FILTER_BUTTON_HOVERED_COLOR); + const QColor selectedColor = CStudioPreferences::timelineFilterButtonSelectedColor(); + const QColor hoveredColor = CStudioPreferences::timelineFilterButtonHoveredColor(); if (m_shy) painter->fillRect(m_rectShy, selectedColor); |