fixed some bugs in omnotebook,

// Anders Fernström

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2081 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: x05andfe

OMNotebook/OMNotebookQT4/cell.cpp

@@ -258,10 +258,15 @@ namespace IAEX
 	}
 
 	/*! 
-	 * \author Ingemar Axelsson
+	 * \author Ingemar Axelsson and Anders Fernström
+	 * \date 2006-02-03 AF
 	 *
 	 * \brief Adds a rule to the cell 
 	 *
+	 *
+	 * 2006-02-03 AF, check and see if rule already existes, if it dose 
+	 * only replace the value
+	 *
 	 * \param r The rule that will be added
 	 *
 	 *
@@ -273,6 +278,7 @@ namespace IAEX
 	{
 		// TODO: DEBUG code: Remove when doing release,
 		// just a check to find new rules
+		
 		/*
 		QRegExp expression( "InitializationCell|CellTags|FontSlant|TextAlignment|TextJustification|FontSize|FontWeight|FontFamily|PageWidth" );
 		if( 0 > r->attribute().indexOf( expression ))
@@ -307,11 +313,28 @@ namespace IAEX
 			}
 		}
 		*/
+		
 
 
 
 		// *** THE REAL FUNCTION ***
-		rules_.push_back(r);
+
+		// check if rule already existes
+		bool found = false;
+		rules_t::iterator iter = rules_.begin();
+		while( iter != rules_.end() )
+		{
+			if( 0 == (*iter)->attribute().indexOf( r->attribute(), 0, Qt::CaseInsensitive ) )
+			{
+				found = true;
+				(*iter)->setValue( r->value() );
+				break;
+			}
+			++iter;
+		}
+
+		if( !found )
+			rules_.push_back(r);
 	}
 
 
@@ -340,7 +363,9 @@ namespace IAEX
 				else if( (*current)->value() == "Right" )
 					style_.setAlignment( Qt::AlignRight );
 				else if( (*current)->value() == "Center" )
-					style_.setAlignment( Qt::AlignCenter );
+					style_.setAlignment( Qt::AlignHCenter );
+				else if( (*current)->value() == "Justify" )
+					style_.setAlignment( Qt::AlignJustify );
 			}
 			else if( (*current)->attribute() == "TextJustification" )
 			{
@@ -374,6 +399,39 @@ namespace IAEX
 			{
 				celltag_ = (*current)->value();
 			}
+			else if( (*current)->attribute() == "OMNotebook_Margin" )
+			{
+				bool ok;
+				int value = (*current)->value().toInt(&ok);
+					
+				if(ok)
+				{
+					if( value > 0 )
+						style_.textFrameFormat()->setMargin( value );
+				}
+			}
+			else if( (*current)->attribute() == "OMNotebook_Padding" )
+			{
+				bool ok;
+				int value = (*current)->value().toInt(&ok);
+					
+				if(ok)
+				{
+					if( value > 0 )
+						style_.textFrameFormat()->setPadding( value );
+				}
+			}
+			else if( (*current)->attribute() == "OMNotebook_Border" )
+			{
+				bool ok;
+				int value = (*current)->value().toInt(&ok);
+					
+				if(ok)
+				{
+					if( value > 0 )
+						style_.textFrameFormat()->setBorder( value );
+				}
+			}
 
 			++current;
 		}

OMNotebook/OMNotebookQT4/cellapplication.cpp

@@ -133,13 +133,13 @@ namespace IAEX
 			{
 				QString msg = e.what();
 				msg += "\nWas unable to start OMC! Closeing OMNotebook!";
-				QMessageBox::warning( 0, "Error", msg, "OK" );
+				QMessageBox::critical( 0, "Error", msg, "OK" );
 				std::exit(-1);
 			}
 #else
 			QString msg = e.what();
 			msg += "\nOMC not started! Closeing OMNotebook!";
-			QMessageBox::warning( 0, "Error", msg, "OK" );
+			QMessageBox::critical( 0, "Error", msg, "OK" );
 			std::exit(-1);
 #endif
 		}
@@ -424,17 +424,17 @@ namespace IAEX
 			// correct size. Ugly way!
 			v->resize( 810, 610 );
 
-			// 2005-11-30 AF, apply hide() and show() to closed groupcells 
-			// childs in the documentview
-			UpdateGroupcellVisitor visitor;
-			v->document()->runVisitor( visitor );
-
 			// 2006-01-17 AF, when the document have been opened, set the
 			// changed variable to false.
 			v->document()->setChanged( false );
 
 			// 2006-01-31 AF, show window again
 			v->showNormal();
+
+			// 2005-11-30 AF, apply hide() and show() to closed groupcells 
+			// childs in the documentview
+			UpdateGroupcellVisitor visitor;
+			v->document()->runVisitor( visitor );
 		}
 		catch( exception &e )
 		{

OMNotebook/OMNotebookQT4/cellcommands.cpp

@@ -106,7 +106,10 @@ namespace IAEX
 
 			// 2005-11-21 AF, Added check if the current cell is a
 			// inputcell, set style to 'text' insted.
-			if( style.name() == "input" || style.name() == "Input" || style.name() == "ModelicaInput" )
+			// 2006-02-03 AF, added check if the current cell is a 
+			// groupcell
+			if( style.name() == "input" || style.name() == "Input" || style.name() == "ModelicaInput" ||
+				style.name() == "cellgroup" )
 				cursor->addBefore(fac->createCell( "Text" ));
 			else
 				cursor->addBefore(fac->createCell(style.name()));

OMNotebook/OMNotebookQT4/celldocument.cpp

@@ -770,16 +770,49 @@ namespace IAEX
 		emit contentChanged();
 	}
 
+	/*! 
+	 * \author Ingemar Axelsson
+	 */
+	void CellDocument::mouseClickedOnCell(Cell *clickedCell)
+	{
+		//Deselect all selection
+		clearSelection();
 
+		//Remove focus from old cell.
+		if(getCursor()->currentCell()->isClosed())
+		{
+			getCursor()->currentCell()->child()->setReadOnly(true);
+			getCursor()->currentCell()->child()->setFocus(false);
+		}
+		else
+		{
+			getCursor()->currentCell()->setReadOnly(true);
+		}
 
+		//Add focus to the cell clicked on.
+		if(clickedCell->parentCell()->isClosed())
+		{
+			getCursor()->moveAfter(clickedCell->parentCell());
+		}
+		else
+		{
+			getCursor()->moveAfter(clickedCell); //Results in bus error why?
+		}
 
+		clickedCell->setReadOnly(false);
+		clickedCell->setFocus(true);
 
-	// ***************************************************************
-
+		emit cursorChanged();
+	}
 
-	void CellDocument::mouseClickedOnCell(Cell *clickedCell)
+	/*! 
+	 * \author Anders Fernström
+	 * \date 2006-02-03
+	 *
+	 * \brief set focus on output part in inputcell
+	 */
+	void CellDocument::mouseClickedOnCellOutput(Cell *clickedCell)
 	{
-		//Deselect all selection
 		clearSelection();
 
 		//Remove focus from old cell.
@@ -803,13 +836,29 @@ namespace IAEX
 			getCursor()->moveAfter(clickedCell); //Results in bus error why?
 		}
 
-		clickedCell->setReadOnly(false);
-		clickedCell->setFocus(true);
+		if( typeid(InputCell) == typeid(*clickedCell) )
+		{
+			InputCell *inputcell = dynamic_cast<InputCell*>(clickedCell);
+			inputcell->setReadOnly(false);
+			inputcell->setFocusOutput(true);
+		}
+		else
+		{
+			clickedCell->setReadOnly(false);
+			clickedCell->setFocus(true);
+		}
 
 		emit cursorChanged();
-		//qDebug("Clicked on cell");
 	}
 
+
+
+	// ***************************************************************
+
+
+
+
+
 	/*! What to do when a link is clicked?
 	*/
 	void CellDocument::linkClicked(const QUrl *link)

OMNotebook/OMNotebookQT4/celldocument.h

@@ -157,6 +157,7 @@ namespace IAEX
 		void selectedACell(Cell *selected, Qt::KeyboardModifiers);
 		void clearSelection();
 		void mouseClickedOnCell(Cell *clickedCell);
+		void mouseClickedOnCellOutput(Cell *clickedCell); //Added 2006-02-03
 		void linkClicked(const QUrl *url);
 		virtual void cursorMoveAfter(Cell *aCell, const bool open);
 		void showHTML(bool b);

OMNotebook/OMNotebookQT4/cellfactory.cpp

@@ -125,6 +125,8 @@ namespace IAEX
 				doc_, SLOT(selectedACell(Cell*,Qt::KeyboardModifiers)));
 			QObject::connect(text, SIGNAL(clicked(Cell *)),
 				doc_, SLOT(mouseClickedOnCell(Cell*)));
+			QObject::connect(text, SIGNAL(clickedOutput(Cell *)),
+				doc_, SLOT(mouseClickedOnCellOutput(Cell*)));
 
 			// 2005-11-29 AF
 			QObject::connect( text, SIGNAL( textChanged() ),