From aa6c6fbece0e19736902c5b1a767db9384b9d89c Mon Sep 17 00:00:00 2001 From: Henning Kiel Date: Tue, 15 Sep 2015 15:49:04 +0200 Subject: [PATCH 1/3] Use CTRL+W to close window like in other OM apps --- OMNotebook/OMNotebookGUI/notebook.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OMNotebook/OMNotebookGUI/notebook.cpp b/OMNotebook/OMNotebookGUI/notebook.cpp index a46a419f592..a9b9068c7fb 100644 --- a/OMNotebook/OMNotebookGUI/notebook.cpp +++ b/OMNotebook/OMNotebookGUI/notebook.cpp @@ -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())); From fb0fbc0ccc8bc85911c21a0b8e5092a02ea75cb8 Mon Sep 17 00:00:00 2001 From: Henning Kiel Date: Tue, 15 Sep 2015 15:49:43 +0200 Subject: [PATCH 2/3] ignore generated file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9e038666379..d1065320f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ config.status config.sub configure install-sh +qmake.sh From 852e3d0cb42fc1371bc0aabe2399bb6e98a4b174 Mon Sep 17 00:00:00 2001 From: Henning Kiel Date: Tue, 15 Sep 2015 15:52:49 +0200 Subject: [PATCH 3/3] fix typo --- DrModelica/QuickTour/Equations.onb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DrModelica/QuickTour/Equations.onb b/DrModelica/QuickTour/Equations.onb index 4c869819df7..824a39b5305 100644 --- a/DrModelica/QuickTour/Equations.onb +++ b/DrModelica/QuickTour/Equations.onb @@ -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;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:12pt; color:#000000;"><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.<br /></span></p></td></tr></table></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Times New Roman'; font-size:12pt; color:#000000;"><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.<br /></span></p></td></tr></table></body></html> class Equations