From 8bb0610097de0c2762acd6de0a531e62e1df09a8 Mon Sep 17 00:00:00 2001 From: x05andfe Date: Tue, 21 Feb 2006 12:29:24 +0000 Subject: [PATCH] =?UTF-8?q?changed=20same=20small=20thing=20in=20OMShell?= =?UTF-8?q?=20and=20OMNotebook.=20Both=20applications=20are=20using=20Qt?= =?UTF-8?q?=204.1,=20Open=20Source=20license=20now.=20//=20Anders=20Fernst?= =?UTF-8?q?r=C3=B6m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2152 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- OMS/QWinMosh.vcproj | 50 ++++++++++++++++++++++----------------------- OMS/oms.cpp | 27 ++++++++++++++++++------ OMS/oms.h | 2 ++ 3 files changed, 48 insertions(+), 31 deletions(-) diff --git a/OMS/QWinMosh.vcproj b/OMS/QWinMosh.vcproj index 1d5ac2e9cea..e2bf20a36e4 100644 --- a/OMS/QWinMosh.vcproj +++ b/OMS/QWinMosh.vcproj @@ -26,7 +26,7 @@ @@ -68,7 +68,7 @@ @@ -131,9 +131,9 @@ @@ -157,9 +157,9 @@ @@ -249,15 +249,6 @@ Name="Generated Files" Filter="moc;h;cpp" UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}"> - - - - - - - - + RelativePath=".\generatedfiles\release\moc_omc_communicator.cpp"> @@ -304,6 +290,20 @@ ObjectFile="$(IntDir)/$(InputName)1.obj"/> + + + + + + + + diff --git a/OMS/oms.cpp b/OMS/oms.cpp index 21fb87ffa5e..0703b64cfd9 100644 --- a/OMS/oms.cpp +++ b/OMS/oms.cpp @@ -256,9 +256,9 @@ OMS::OMS( QWidget* parent ) qApp, SLOT( quit() )); // sett start message - cursor_.insertText( "OpenModelica 1.3.2\n" ); - cursor_.insertText( "Copyright 2002-2006, PELAB, Linkoping University\n\n" ); - cursor_.insertText( "To get help on using OMShell and OpenModelica, type \"help()\" and press enter.\n" ); + cursor_.insertText( "OpenModelica 1.3.2\n", textFormat_ ); + cursor_.insertText( "Copyright 2002-2006, PELAB, Linkoping University\n\n", textFormat_ ); + cursor_.insertText( "To get help on using OMShell and OpenModelica, type \"help()\" and press enter.\n", textFormat_ ); // add function names for code completion @@ -318,6 +318,7 @@ OMS::~OMS() delete viewToolbar_; delete viewStatusbar_; delete aboutOMS_; + delete aboutQT_; delete print_; delete startServer_; delete stopServer_; @@ -348,6 +349,8 @@ void OMS::createMoshEdit() moshEdit_->setFontWeight( QFont::Normal ); moshEdit_->setFontPointSize( fontSize_ ); + textFormat_ = moshEdit_->currentCharFormat(); + connect( moshEdit_, SIGNAL( returnPressed() ), this, SLOT( returnPressed() )); connect( moshEdit_, SIGNAL( insertNewline() ), @@ -454,6 +457,12 @@ void OMS::createAction() connect( aboutOMS_, SIGNAL( triggered() ), this, SLOT( aboutOMS() )); + // Added 2006-02-21 AF + aboutQT_ = new QAction( tr("About &Qt"), this ); + aboutQT_->setStatusTip( tr("Display information about Qt") ); + connect( aboutQT_, SIGNAL( triggered() ), + this, SLOT( aboutQT() )); + print_ = new QAction( QIcon(":/Resources/print.bmp"), tr("&Print"), this ); print_->setShortcut( tr("Ctrl+P") ); print_->setStatusTip( tr("Print the contents in the input window") ); @@ -507,6 +516,7 @@ void OMS::createMenu() viewMenu_->addAction( viewStatusbar_ ); helpMenu_->addAction( aboutOMS_ ); + helpMenu_->addAction( aboutQT_ ); } void OMS::createToolbar() @@ -619,9 +629,9 @@ void OMS::returnPressed() QString res = delegate_->getResult(); if( res.isEmpty() ) - cursor_.insertText( "\n" ); + cursor_.insertText( "\n", textFormat_ ); else - cursor_.insertText( "\n" + res + "\n" ); + cursor_.insertText( "\n" + res + "\n", textFormat_ ); // get Error text try @@ -643,7 +653,7 @@ void OMS::returnPressed() else { QTextCursor cursor = moshError_->textCursor(); - cursor.insertText("[ERROR] No OMC serer started\n"); + cursor.insertText("[ERROR] No OMC serer started\n" ); } // add new command line @@ -981,6 +991,11 @@ void OMS::aboutOMS() QString("Copyright PELAB (c) 2006") ); } +void OMS::aboutQT() +{ + QMessageBox::aboutQt( this ); +} + void OMS::print() { // TODO: Implement print diff --git a/OMS/oms.h b/OMS/oms.h index f638fb2d437..cd472de25ef 100644 --- a/OMS/oms.h +++ b/OMS/oms.h @@ -104,6 +104,7 @@ public slots: void viewToolbar(); void viewStatusbar(); void aboutOMS(); + void aboutQT(); // Added 2006-02-21 AF void print(); bool startServer(); void stopServer(); @@ -156,6 +157,7 @@ private slots: QAction* viewToolbar_; QAction* viewStatusbar_; QAction* aboutOMS_; + QAction* aboutQT_; // Added 2006-02-21 AF QAction* print_; QAction* startServer_; QAction* stopServer_;