Skip to content

Commit

Permalink
Merge pull request #1 from hkiel/change_menu_shortcut
Browse files Browse the repository at this point in the history
Change menu shortcut
  • Loading branch information
sjoelund committed Sep 15, 2015
2 parents fe38b0d + 852e3d0 commit 9e4ed5c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -19,3 +19,4 @@ config.status
config.sub
configure
install-sh
qmake.sh
2 changes: 1 addition & 1 deletion DrModelica/QuickTour/Equations.onb
Expand Up @@ -31,7 +31,7 @@ p, li { white-space: pre-wrap; }
<table border="0" style="-qt-table-type: root; margin-top:5px; margin-bottom:5px; margin-left:5px; margin-right:5px;">
<tr>
<td style="border: none;">
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-family:'Times New Roman'; font-size:12pt; color:#000000;">&lt;br />Equations in Modelica can be classified into three different groups: Normal equations, that occur in equation sections, declaration equations and modification equations. Equations are more powerful than assignments, since one equation can express seceral different assignments.&lt;br />&lt;/span>&lt;/p>&lt;/td>&lt;/tr>&lt;/table>&lt;/body>&lt;/html></Text>
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-family:'Times New Roman'; font-size:12pt; color:#000000;">&lt;br />Equations in Modelica can be classified into three different groups: Normal equations, that occur in equation sections, declaration equations and modification equations. Equations are more powerful than assignments, since one equation can express several different assignments.&lt;br />&lt;/span>&lt;/p>&lt;/td>&lt;/tr>&lt;/table>&lt;/body>&lt;/html></Text>
</TextCell>
<GraphCell style="Graph" closed="false">
<Input>class Equations
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/OMNotebookGUI/notebook.cpp
Expand Up @@ -496,7 +496,7 @@ void NotebookWindow::createFileMenu()

// CLOSE FILE
closeFileAction = new QAction( tr("&Close"), this );
closeFileAction->setShortcut( tr("Ctrl+F4") );
closeFileAction->setShortcut( tr("Ctrl+W") );
closeFileAction->setStatusTip( tr("Close the window") );
connect(closeFileAction, SIGNAL(triggered()), this, SLOT(closeFile()));

Expand Down

0 comments on commit 9e4ed5c

Please sign in to comment.