fix Ticket:4704

accept click on input cell after clicking output cell allow to open empty notebooks apply style to output cells
OpenModelica · Jan 18, 2018 · 4a5e0fc · 4a5e0fc
1 parent 5650618
commit 4a5e0fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/OMNotebook/OMNotebookGUI/celldocument.cpp b/OMNotebook/OMNotebookGUI/celldocument.cpp
@@ -945,13 +945,7 @@ namespace IAEX
    */
   void CellDocument::mouseClickedOnCell(Cell *clickedCell)
   {
-
-    // 2006-04-25, AF
-    if( lastClickedCell_ == clickedCell )
-      return;
-    else
-      lastClickedCell_ = clickedCell;
-
+    lastClickedCell_ = clickedCell;
 
     //Deselect all selection
     clearSelection();

diff --git a/OMNotebook/OMNotebookGUI/graphcell.cpp b/OMNotebook/OMNotebookGUI/graphcell.cpp
@@ -856,12 +856,9 @@ namespace IAEX {
     layout_->addWidget( output_, 2, 1 );
 
     output_->setReadOnly( true );
-
     output_->setOpenLinks(false);
-
     output_->setFrameShape( QFrame::Box );
     output_->setAutoFormatting( QTextEdit::AutoNone );
-
     output_->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     output_->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
 
@@ -908,6 +905,7 @@ namespace IAEX {
       output_->setAlignment( (Qt::AlignmentFlag)style.alignment() );
       output_->mergeCurrentCharFormat( (*style.textCharFormat()) );
       output_->document()->rootFrame()->setFrameFormat( (*style.textFrameFormat()) );
+      output_->setFont(style.textCharFormat()->font());
     }
     else
     {

diff --git a/OMNotebook/OMNotebookGUI/xmlparser.cpp b/OMNotebook/OMNotebookGUI/xmlparser.cpp
@@ -253,12 +253,14 @@ namespace IAEX
       throw e;
     }
 
+/* Do not throw an error if empty notebook is opened
     // check if root cell is empty
     if( !rootcell->hasChilds() )
     {
       string msg = "File " + filename_.toStdString() + " is empty";
       throw runtime_error( msg.c_str() );
     }
+*/
 
     return rootcell;
   }