r19084 by jghali - #12258: Frame color can't be changed

[scribus-commit]

Author: jghali
Date: Wed Apr 23 22:23:09 2014
New Revision: 19084

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19084
Log:
#12258: Frame color can't be changed

Modified:
    branches/Version14x/Scribus/scribus/canvasmode.cpp

Modified: branches/Version14x/Scribus/scribus/canvasmode.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19084&path=/branches/Version14x/Scribus/scribus/canvasmode.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode.cpp Wed Apr 23 22:23:09 2014
@@ -37,6 +37,7 @@
 #ifdef GESTURE_FRAME_PREVIEW
 #include "pageitempreview.h"
 #endif
+#include "prefsmanager.h"
 #include "selection.h"
 #include "scpainter.h"
 #include "scresizecursor.h"
@@ -56,20 +57,20 @@
 {
 	m_pen["outline"]	= QPen(Qt::gray, 1.0 , Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	m_pen["outline"].setCosmetic(true);
-	m_pen["selection"]	= QPen(Qt::red, 1.0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+	m_pen["selection"]	= QPen(PrefsManager::instance()->appPrefs.DFrameColor, 1.0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	m_pen["selection"].setCosmetic(true);
 	m_pen["selection-group"] = QPen(Qt::red, 1.0 , Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	m_pen["selection-group"].setCosmetic(true);
-	m_pen["selection-group-inside"] = QPen(Qt::red, 1.0 , Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+	m_pen["selection-group-inside"] = QPen(PrefsManager::instance()->appPrefs.DFrameGroupColor, 1.0 , Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	m_pen["selection-group-inside"].setCosmetic(true);
-	m_pen["handle"]		= QPen(Qt::red, 1.0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+	m_pen["handle"]		= QPen(PrefsManager::instance()->appPrefs.DFrameColor, 1.0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 	m_pen["handle"].setCosmetic(true);
 	
 	m_brush["outline"]	= Qt::NoBrush;
 	m_brush["selection"]	= Qt::NoBrush;
 	m_brush["selection-group"] = QColor(255,0,0,10);
 	m_brush["selection-group-inside"] = Qt::NoBrush;
-	m_brush["handle"]	= Qt::red;
+	m_brush["handle"]	= PrefsManager::instance()->appPrefs.DFrameColor;
 }
 
 CanvasMode::~CanvasMode()