[Uml-devel] kdesdk/umbrello/umbrello/dialogs

[Brian Thomas]

CVS commit by thomas: 

changes to coloriztion of operations/decl/accessor codeblocks to be umlObject


  M +19 -10    codeeditor.cpp   1.8


--- kdesdk/umbrello/umbrello/dialogs/codeeditor.cpp  #1.7:1.8
@@ -329,4 +329,5 @@ void CodeEditor::insertText (CodeClassFi
         UMLObject * parentObj = db->getParentClassField()->getParentObject();
 
+        QColor bgcolor = getState().editBlockColor;
         QString componentName = QString("");
         if(parentObj)
@@ -338,9 +339,9 @@ void CodeEditor::insertText (CodeClassFi
                         componentName = parentDocName + "::association_field(" + role->getName() + ")";
                 }
+                bgcolor = getState().umlObjectColor;
         }
 
         insertText(db->getComment(), db, parentObj,componentName);
 
-        QColor bgcolor = getState().editBlockColor;
         if(!db->getWriteOutText() && m_showHiddenBlocks)
                 bgcolor = getState().hiddenColor;
@@ -357,5 +358,5 @@ void CodeEditor::insertText (CodeMethodB
                 return;
 
-        QColor bgcolor;
+        QColor bgcolor = getState().umlObjectColor;
         QString indent = mb->getIndentationString();
         QString bodyIndent = mb->getIndentationString(mb->getIndentationLevel()+1);
@@ -365,13 +366,21 @@ void CodeEditor::insertText (CodeMethodB
         QString endText = mb->formatMultiLineText( mb->getEndMethodText(), indent, "\n");
 
-        if(dynamic_cast<CodeAccessorMethod*>(mb)) {
-                bgcolor = getState().editBlockColor;
-        } else {
-                bgcolor = getState().nonEditBlockColor;
-        }
-
         if(!mb->getWriteOutText() && m_showHiddenBlocks)
+        {
+
+                // quick check, IF CodeAccessors are hidden, we DONT show
+                // it even when requested as the hiddeness of these methods
+                // should be controled by the class fields, not the user.
+/*
+                if(mb->contentType() == CodeBlock::AutoGenerated 
+                                && dynamic_cast<CodeAccessorMethod*>(mb)) 
+                        return;
+*/
+
+                // everything else gets the 'hidden' color
                 bgcolor = getState().hiddenColor;
 
+        }
+
         QString componentName = QString("<b>parentless method\?</b>");
 
@@ -445,5 +454,5 @@ void CodeEditor::insertText(Hierarchical
                         componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ")";
 
-                paperColor = getState().editBlockColor;
+                paperColor = getState().umlObjectColor;
         }
 
@@ -644,5 +653,5 @@ void CodeEditor::slotPasteTextBlock ( ) 
         if(m_textBlockToPaste) 
         {
-                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock);
+                m_parentDoc->insertTextBlock(m_textBlockToPaste, m_selectedTextBlock)
                 m_textBlockToPaste = 0;
                 rebuildView(m_lastPara);