Show help text in statusTip for command completion

do not do command completion in LaTeX cells
OpenModelica · Dec 8, 2016 · 29e5dff · 29e5dff
1 parent a21855e
commit 29e5dff
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 85 deletions.
diff --git a/OMNotebook/OMNotebookGUI/commands.xml b/OMNotebook/OMNotebookGUI/commands.xml
@@ -55,7 +55,7 @@
 		<field name="$0">var</field>
 		<helptext>Plot a variable from the most recently simulated model. Ex: plot(x).</helptext>
 	</command>
-	<command name="plot($0)">
+	<command name="plot({$0})">
 		<field name="$0">vars</field>
 		<helptext>Plot variables from the most recently simulated model given as a vector. Ex: plot({x,y}).</helptext>
 	</command>

diff --git a/OMNotebook/OMNotebookGUI/graphcell.cpp b/OMNotebook/OMNotebookGUI/graphcell.cpp
@@ -214,9 +214,9 @@ namespace IAEX {
         emit command();
       }
     }
-    // COMMAND COMPLETION- NEXT FIELD, key: CTRL + TAB
-    else if( event->modifiers() == Qt::ControlModifier &&
-      event->key() == Qt::Key_Tab )
+    // COMMAND COMPLETION- NEXT FIELD, key: CTRL + TAB || SHIFT + SPACE
+    else if( (event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_Tab ) ||
+      (event->modifiers() == Qt::ShiftModifier && event->key() == Qt::Key_Space ) )
     {
 
       event->accept();
@@ -1540,8 +1540,10 @@ namespace IAEX {
     CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
     QTextCursor cursor = input_->textCursor();
 
-    if( commandcompletion->insertCommand( cursor ))
+    if( commandcompletion->insertCommand( cursor )) {
       input_->setTextCursor( cursor );
+      emit newState(commandcompletion->helpCommand().toLatin1().data());
+    }
   }
 
   /*!
@@ -1553,12 +1555,14 @@ namespace IAEX {
   */
   void GraphCell::nextCommand()
   {
-    qDebug("Next Command");
+    //qDebug("Next Command");
     CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
     QTextCursor cursor = input_->textCursor();
 
-    if( commandcompletion->nextCommand( cursor ))
+    if( commandcompletion->nextCommand( cursor )) {
       input_->setTextCursor( cursor );
+      emit newState(commandcompletion->helpCommand().toLatin1().data());
+    }
   }
 
   /*!
@@ -1569,7 +1573,7 @@ namespace IAEX {
   */
   void GraphCell::nextField()
   {
-    qDebug("Next Field");
+    //qDebug("Next Field");
     CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
     QTextCursor cursor = input_->textCursor();
 

diff --git a/OMNotebook/OMNotebookGUI/latexcell.cpp b/OMNotebook/OMNotebookGUI/latexcell.cpp
@@ -80,7 +80,6 @@
 
 #include "treeview.h"
 #include "stylesheet.h"
-#include "commandcompletion.h"
 #include "omcinteractiveenvironment.h"
 #include "indent.h"
 
@@ -178,31 +177,6 @@ namespace IAEX {
       event->accept();
       emit eval();
     }
-    // COMMAND COMPLETION, key: SHIFT + TAB (= BACKTAB) || CTRL + SPACE
-    else if( (event->modifiers() == Qt::ShiftModifier && event->key() == Qt::Key_Backtab ) ||
-      (event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_Space) )
-    {
-
-      event->accept();
-      if( inCommand )
-      {
-        emit nextCommand();
-      }
-      else
-      {
-        inCommand = true;
-        emit command();
-      }
-    }
-    // COMMAND COMPLETION- NEXT FIELD, key: CTRL + TAB
-    else if( event->modifiers() == Qt::ControlModifier &&
-      event->key() == Qt::Key_Tab )
-    {
-
-      event->accept();
-      inCommand = false;
-      emit nextField();
-    }
     // BACKSPACE, DELETE
     else if( event->key() == Qt::Key_Backspace ||
       event->key() == Qt::Key_Delete )
@@ -499,10 +473,6 @@ namespace IAEX {
     connect( input_, SIGNAL( clickOnCell() ), this, SLOT( clickEvent() ));
     connect( input_, SIGNAL( wheelMove(QWheelEvent*) ), this, SLOT( wheelEvent(QWheelEvent*) ));
     connect( input_, SIGNAL( eval() ), this, SLOT( eval() ));
-    connect( input_, SIGNAL( command() ), this, SLOT( command() ));
-    connect( input_, SIGNAL( nextCommand() ), this, SLOT( nextCommand() ));
-    connect( input_, SIGNAL( nextField() ), this, SLOT( nextField() ));
-    connect( input_, SIGNAL( nextField() ), this, SLOT( nextField() ));
 
     //connect( input_, SIGNAL( textChanged() ), this, SLOT( addToHighlighter() ));
     connect( input_, SIGNAL( currentCharFormatChanged(const QTextCharFormat &) ),
@@ -1250,47 +1220,6 @@ void LatexCell::setState(int state_)
     }
   }
 
-  /*!
-  *\brief Get/Insert the command that match the last word in the
-  * input editor.
-  */
-  void LatexCell::command()
-  {
-    CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
-    QTextCursor cursor = input_->textCursor();
-
-    if( commandcompletion->insertCommand( cursor ))
-      input_->setTextCursor( cursor );
-  }
-
-  /*!
-  *\brief Get/Insert the next command that match the last word in
-  * the input editor.
-  */
-  void LatexCell::nextCommand()
-  {
-    CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
-    QTextCursor cursor = input_->textCursor();
-
-    if( commandcompletion->nextCommand( cursor ))
-      input_->setTextCursor( cursor );
-
-  }
-
-  /*!
-  *\brief Select the next field in the command, if any exists
-  */
-  void LatexCell::nextField()
-  {
-    CommandCompletion *commandcompletion = CommandCompletion::instance( "commands.xml" );
-    QTextCursor cursor = input_->textCursor();
-
-    if( commandcompletion->nextField( cursor ))
-      input_->setTextCursor( cursor );
-
-  }
-
-
   /*!
   * \brief set the correct style if the charFormat is changed and the
   * cell is empty. This is done because otherwise the style is lost if

diff --git a/OMNotebook/OMNotebookGUI/latexcell.h b/OMNotebook/OMNotebookGUI/latexcell.h
@@ -95,9 +95,6 @@ namespace IAEX
 
   public slots:
     void eval();
-    void command();
-    void nextCommand();
-    void nextField();
     void clickEvent();
     void clickEventOutput();
     void contentChanged();
@@ -179,9 +176,6 @@ namespace IAEX
   signals:
     void clickOnCell();
     void wheelMove( QWheelEvent* );
-    void command();
-    void nextCommand();
-    void nextField();
     void eval();
     void forwardAction( int );
     void updatePos(int, int);