[qet] [4031] Grey background : title block and border have grey background too.

[subversion@xxxxxxxxxxxxx]

Revision: 4031
Author:   blacksun
Date:     2015-06-28 14:37:10 +0200 (Sun, 28 Jun 2015)
Log Message:
-----------
Grey background : title block and border have grey background too.
Help line of item(add shape, or add element) change is color when background is grey

Modified Paths:
--------------
    trunk/sources/bordertitleblock.cpp
    trunk/sources/dvevent/dveventaddshape.cpp
    trunk/sources/qetgraphicsitem/terminal.cpp
    trunk/sources/titleblocktemplate.cpp

Modified: trunk/sources/bordertitleblock.cpp
===================================================================
--- trunk/sources/bordertitleblock.cpp	2015-06-27 16:02:28 UTC (rev 4030)
+++ trunk/sources/bordertitleblock.cpp	2015-06-28 12:37:10 UTC (rev 4031)
@@ -423,8 +423,8 @@
 	painter -> setFont(QETApp::diagramTextsFont());
 	
 		//Draw the empty case at the top left of diagram when there is header
-	if (display_border_ && (display_columns_ || display_rows_)) {
-		painter -> setBrush(Qt::white);
+	if (display_border_ && (display_columns_ || display_rows_))
+	{
 		QRectF first_rectangle(
 			diagram_rect_.topLeft().x(),
 			diagram_rect_.topLeft().y(),

Modified: trunk/sources/dvevent/dveventaddshape.cpp
===================================================================
--- trunk/sources/dvevent/dveventaddshape.cpp	2015-06-27 16:02:28 UTC (rev 4030)
+++ trunk/sources/dvevent/dveventaddshape.cpp	2015-06-28 12:37:10 UTC (rev 4031)
@@ -188,7 +188,7 @@
 		QPen pen;
 		pen.setWidthF(0.4);
 		pen.setCosmetic(true);
-		pen.setColor(Qt::darkGray);
+		pen.setColor(Diagram::background_color == Qt::darkGray ? Qt::lightGray : Qt::darkGray);
 
 		QRectF rect = m_diagram -> border_and_titleblock.insideBorderRect();
 

Modified: trunk/sources/qetgraphicsitem/terminal.cpp
===================================================================
--- trunk/sources/qetgraphicsitem/terminal.cpp	2015-06-27 16:02:28 UTC (rev 4030)
+++ trunk/sources/qetgraphicsitem/terminal.cpp	2015-06-28 12:37:10 UTC (rev 4031)
@@ -314,7 +314,7 @@
 		{
 			m_help_line_a = new QGraphicsLineItem(this);
 			QPen pen;
-			pen.setColor(Qt::darkGray);
+			pen.setColor(Diagram::background_color == Qt::darkGray ? Qt::lightGray : Qt::darkGray);
 			m_help_line_a -> setPen(pen);
 		}
 

Modified: trunk/sources/titleblocktemplate.cpp
===================================================================
--- trunk/sources/titleblocktemplate.cpp	2015-06-27 16:02:28 UTC (rev 4030)
+++ trunk/sources/titleblocktemplate.cpp	2015-06-28 12:37:10 UTC (rev 4031)
@@ -1233,7 +1233,6 @@
 	QPen pen(Qt::black);
 	pen.setCosmetic(true);
 	painter.setPen(pen);
-	painter.setBrush(Qt::white);
 	
 	// draw the titleblock border
 	painter.drawRect(QRect(0, 0, titleblock_width, titleblock_height));
@@ -1322,7 +1321,6 @@
 	QPen pen(QBrush(), 0.0, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin);
 	pen.setColor(Qt::black);
 	painter.setPen(pen);
-	painter.setBrush(Qt::white);
 	painter.drawRect(cell_rect);
 	
 	painter.save();