From 882824e9a14dad61c8570ec9922b8389c6ab611b Mon Sep 17 00:00:00 2001 From: Aleks Kissinger Date: Tue, 16 Oct 2018 07:15:15 +0200 Subject: fixed colors --- src/tikzit.cpp | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/tikzit.cpp b/src/tikzit.cpp index 791aa83..5433577 100644 --- a/src/tikzit.cpp +++ b/src/tikzit.cpp @@ -43,31 +43,55 @@ void Tikzit::init() // 19 standard xcolor colours _colNames << "black" << - "gray" << - "darkgray" << + "darkgray" << + "gray" << "lightgray" << "white" << "red" << "orange" << "yellow" << - "lime" << + "green" << "blue" << "purple" << "brown" << "olive" << - "green" << - "teal" << - "cyan" << + "lime" << + "cyan" << + "teal" << "magenta" << "violet" << "pink"; - for (int i = 0; i < _colNames.length(); ++i) { - _cols << QColor(_colNames[i]); - } + _cols << + QColor::fromRgbF(0,0,0) << + QColor::fromRgbF(0.25,0.25,0.25) << + QColor::fromRgbF(0.5,0.5,0.5) << + QColor::fromRgbF(0.75,0.75,0.75) << + QColor::fromRgbF(1,1,1) << + + QColor::fromRgbF(1,0,0) << + QColor::fromRgbF(1,0.5,0) << + QColor::fromRgbF(1,1,0) << + QColor::fromRgbF(0,1,0) << + QColor::fromRgbF(0,0,1) << + QColor::fromRgbF(0.75,0,0.25) << + + QColor::fromRgbF(0.75,0.5,0.25) << + QColor::fromRgbF(0.5,0.5,0) << + QColor::fromRgbF(0.75,1,0) << + QColor::fromRgbF(0,1,1) << + QColor::fromRgbF(0,0.5,0.5) << + + QColor::fromRgbF(1,0,1) << + QColor::fromRgbF(0.5,0,0.5) << + QColor::fromRgbF(1,0.75,0.75); + +// for (int i = 0; i < _colNames.length(); ++i) { +// _cols << QColor(_colNames[i]); +// } _mainMenu = new MainMenu(); QMainWindow *dummy = new QMainWindow(); -- cgit v1.2.3