From ff77276b636e82ff534d4319e281e7d4750bb48b Mon Sep 17 00:00:00 2001
From: Mark Long <mark.long@eecweathertech.com>
Date: Sun, 30 Oct 2016 18:31:11 -0500
Subject: [PATCH] Moved color definitions to AppleColors.h

---
 AppleSAWS.pro                      |  3 ++-
 src/ui/widgets/HiresScreenWidget.h | 18 +-----------------
 src/util/AppleColors.h             | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 src/util/AppleColors.h

diff --git a/AppleSAWS.pro b/AppleSAWS.pro
index 8317405..c04e77a 100644
--- a/AppleSAWS.pro
+++ b/AppleSAWS.pro
@@ -115,7 +115,8 @@ HEADERS += \
     src/binaryfile/MemoryUsageMap.h \
     src/ui/diskexplorer/DiskExplorer.h \
     src/ui/diskexplorer/DiskExplorerMapWidget.h \
-    src/applesoftfile/ApplesoftRetokenizer.h
+    src/applesoftfile/ApplesoftRetokenizer.h \
+    src/util/AppleColors.h
 
 FORMS += \
     src/ui/catalogwidget.ui \
diff --git a/src/ui/widgets/HiresScreenWidget.h b/src/ui/widgets/HiresScreenWidget.h
index 51b3239..6e28a31 100644
--- a/src/ui/widgets/HiresScreenWidget.h
+++ b/src/ui/widgets/HiresScreenWidget.h
@@ -2,6 +2,7 @@
 #define HIRESSCREENWIDGET_H
 
 #include "binaryfile.h"
+#include "AppleColors.h"
 
 #include <QWidget>
 #include <QPixmap>
@@ -14,23 +15,6 @@
 #include <QVector>
 #include <QDebug>
 
-static const QColor blackColor     = QColor(0,0,0);
-static const QColor grayColor      = QColor(156,156,156);
-static const QColor gray2Color     = QColor(156,156,156);
-static const QColor whiteColor     = QColor(255,255,255);
-static const QColor darkBlueColor  = QColor(96,78,189);
-static const QColor lightBlueColor = QColor(208,195,255);
-static const QColor purpleColor    = QColor(255,68,253);
-static const QColor redColor       = QColor(227,30,96);
-static const QColor pinkColor      = QColor(255,160,208);
-static const QColor orangeColor    = QColor(255,106,60);
-static const QColor brownColor     = QColor(96,114,3);
-static const QColor yellowColor    = QColor(208,221,141);
-static const QColor greenColor     = QColor(20,245,60);
-static const QColor darkGreenColor = QColor(0,163,96);
-static const QColor aquaColor      = QColor(114,255,208);
-static const QColor blueColor      = QColor(20,207,253);
-
 class HiresScreenWidget : public QWidget
 {
     Q_OBJECT
diff --git a/src/util/AppleColors.h b/src/util/AppleColors.h
new file mode 100644
index 0000000..2de78c3
--- /dev/null
+++ b/src/util/AppleColors.h
@@ -0,0 +1,23 @@
+#ifndef APPLECOLORS_H
+#define APPLECOLORS_H
+
+#include <QColor>
+
+static const QColor blackColor     = QColor(0x00,0x00,0x00);
+static const QColor redColor       = QColor(0xe3,0x1e,0x60);
+static const QColor darkBlueColor  = QColor(0x60,0x4e,0xbd);
+static const QColor purpleColor    = QColor(0xff,0x44,0xfd);
+static const QColor darkGreenColor = QColor(0x00,0xa3,0x60);
+static const QColor grayColor      = QColor(0x9c,0x9c,0x9c);
+static const QColor blueColor      = QColor(0x14,0xcf,0xfd);
+static const QColor lightBlueColor = QColor(0xd0,0xc3,0xff);
+static const QColor brownColor     = QColor(0x60,0x72,0x03);
+static const QColor orangeColor    = QColor(0xff,0x6a,0x3c);
+static const QColor gray2Color     = QColor(0x9c,0x9c,0x9c);
+static const QColor pinkColor      = QColor(0xff,0xa0,0xd0);
+static const QColor greenColor     = QColor(0x14,0xf5,0x3c);
+static const QColor yellowColor    = QColor(0xd0,0xdd,0x8d);
+static const QColor aquaColor      = QColor(0x72,0xff,0xd0);
+static const QColor whiteColor     = QColor(0xff,0xff,0xff);
+
+#endif // APPLECOLORS_H