Skip to content

Commit 2d72701

Browse files
adrpoadrpo
committed
- fixed an OMC crash on Vista (sendData.cpp)
- added icons for Plot Window (ext.exe) and OMC (omc.exe) - display the Plot Window (ext.exe) on the taskbar - updated copyright in OMShell - added .pdb files for releases: ext.exe, OMShell.exe, omc.exe to make it easier to debug crashes - fixed the last date in OpenModelica System Guide - fixed 3D_Bouncinball3D.onb - fixed OMShell runtime error at start git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3844 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent bd30c7d commit 2d72701

File tree

8 files changed

+260
-1
lines changed

8 files changed

+260
-1
lines changed

‎OMNotebook/OMNotebookQT4/res.aps

0 Bytes
Binary file not shown.

‎OMNotebook/ext/Resources/plotWindow.ico

1.05 KB
Binary file not shown.

‎OMNotebook/ext/e.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,23 @@
3232

3333
#include <QApplication>
3434
#include "../Pltpkg2/graphWindow.h"
35+
#include "resource.h"
3536
using namespace std;
3637

3738
int main(int argc, char** argv)
3839
{
3940
QApplication a(argc, argv);
4041
QFrame *mainFrame_ = new QFrame();
42+
QMainWindow *mw = new QMainWindow();
43+
mw->setWindowTitle("Plot Window");
44+
mw->setWindowIcon( QIcon(":/Resources/plotWindow.bmp"));
4145
#ifndef __APPLE_CC__
4246
SoQt::init(mainFrame_);
4347
#endif
4448
GraphWindow *w = new GraphWindow(mainFrame_);
49+
mw->setCentralWidget(w);
4550
w->compoundWidget->gwMain->setServerState(true);
46-
w->show();
51+
mw->show();
4752

4853
return a.exec();
4954
}

‎OMNotebook/ext/ext.rc

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
// Microsoft Visual C++ generated resource script.
2+
//
3+
#include "resource.h"
4+
5+
#define APSTUDIO_READONLY_SYMBOLS
6+
/////////////////////////////////////////////////////////////////////////////
7+
//
8+
// Generated from the TEXTINCLUDE 2 resource.
9+
//
10+
#include "afxres.h"
11+
12+
/////////////////////////////////////////////////////////////////////////////
13+
#undef APSTUDIO_READONLY_SYMBOLS
14+
15+
/////////////////////////////////////////////////////////////////////////////
16+
// English (U.S.) resources
17+
18+
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
19+
#ifdef _WIN32
20+
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
21+
#pragma code_page(1252)
22+
#endif //_WIN32
23+
24+
#ifdef APSTUDIO_INVOKED
25+
/////////////////////////////////////////////////////////////////////////////
26+
//
27+
// TEXTINCLUDE
28+
//
29+
30+
1 TEXTINCLUDE
31+
BEGIN
32+
"resource.h\0"
33+
END
34+
35+
2 TEXTINCLUDE
36+
BEGIN
37+
"#include ""afxres.h""\r\n"
38+
"\0"
39+
END
40+
41+
3 TEXTINCLUDE
42+
BEGIN
43+
"\r\n"
44+
"\0"
45+
END
46+
47+
#endif // APSTUDIO_INVOKED
48+
49+
#endif // English (U.S.) resources
50+
/////////////////////////////////////////////////////////////////////////////
51+
52+
53+
/////////////////////////////////////////////////////////////////////////////
54+
// Swedish resources
55+
56+
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
57+
#ifdef _WIN32
58+
LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
59+
#pragma code_page(1252)
60+
#endif //_WIN32
61+
62+
/////////////////////////////////////////////////////////////////////////////
63+
//
64+
// Icon
65+
//
66+
67+
// Icon with lowest ID value placed first to ensure application icon
68+
// remains consistent on all systems.
69+
IDI_ICON1 ICON "Resources\\plotWindow.ico"
70+
71+
/////////////////////////////////////////////////////////////////////////////
72+
//
73+
// Bitmap
74+
//
75+
76+
IDB_BITMAP1 BITMAP "Resources\\plotWindow.bmp"
77+
#endif // Swedish resources
78+
/////////////////////////////////////////////////////////////////////////////
79+
80+
81+
82+
#ifndef APSTUDIO_INVOKED
83+
/////////////////////////////////////////////////////////////////////////////
84+
//
85+
// Generated from the TEXTINCLUDE 3 resource.
86+
//
87+
88+
89+
/////////////////////////////////////////////////////////////////////////////
90+
#endif // not APSTUDIO_INVOKED
91+

‎OMNotebook/ext/ext.vcproj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,20 @@
235235
RelativePath="..\Pltpkg2\lineGroup.cpp"
236236
>
237237
</File>
238+
<File
239+
RelativePath=".\qtres.qrc"
240+
>
241+
<FileConfiguration
242+
Name="Release|Win32"
243+
>
244+
<Tool
245+
Name="VCCustomBuildTool"
246+
CommandLine="$(QTHOME)\bin\rcc.exe -o generatedfiles/qtres.cpp qtres.qrc"
247+
AdditionalDependencies="qtres.qrc"
248+
Outputs="generatedfiles/qtres.cpp"
249+
/>
250+
</FileConfiguration>
251+
</File>
238252
<File
239253
RelativePath="..\Pltpkg2\variableData.cpp"
240254
>
@@ -425,6 +439,10 @@
425439
/>
426440
</FileConfiguration>
427441
</File>
442+
<File
443+
RelativePath=".\generatedfiles\qtres.cpp"
444+
>
445+
</File>
428446
</Filter>
429447
<File
430448
RelativePath=".\ext.rc"
@@ -434,6 +452,18 @@
434452
RelativePath="..\OMNotebookQT4\omnotebook_png.png"
435453
>
436454
</File>
455+
<File
456+
RelativePath=".\Resources\plotWindow.bmp"
457+
>
458+
</File>
459+
<File
460+
RelativePath=".\Resources\plotWindow.ico"
461+
>
462+
</File>
463+
<File
464+
RelativePath=".\Resources\plotWindow.png"
465+
>
466+
</File>
437467
</Files>
438468
<Globals>
439469
</Globals>

‎OMNotebook/ext/generatedfiles/qtres.cpp

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
/****************************************************************************
2+
** Resource object code
3+
**
4+
** Created: Thu 5. Feb 02:51:50 2009
5+
** by: The Resource Compiler for Qt version 4.4.3
6+
**
7+
** WARNING! All changes made in this file will be lost!
8+
*****************************************************************************/
9+
10+
#include <QtCore/qglobal.h>
11+
12+
static const unsigned char qt_resource_data[] = {
13+
// C:/bin/cygwin/home/adrpo/dev/OpenModelica/OMNotebook/ext/Resources/plotWindow.bmp
14+
0x0,0x0,0x2,0x76,
15+
0x42,
16+
0x4d,0x76,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x76,0x0,0x0,0x0,0x28,0x0,0x0,
17+
0x0,0x20,0x0,0x0,0x0,0x20,0x0,0x0,0x0,0x1,0x0,0x4,0x0,0x0,0x0,0x0,
18+
0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,
19+
0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,
20+
0x0,0x0,0x80,0x80,0x0,0x80,0x0,0x0,0x0,0x80,0x0,0x80,0x0,0x80,0x80,0x0,
21+
0x0,0xc0,0xc0,0xc0,0x0,0x80,0x80,0x80,0x0,0x0,0x0,0xff,0x0,0x0,0xff,0x0,
22+
0x0,0x0,0xff,0xff,0x0,0xff,0x0,0x0,0x0,0xff,0x0,0xff,0x0,0xff,0xff,0x0,
23+
0x0,0xff,0xff,0xff,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
24+
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
25+
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
26+
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
27+
0xff,0xff,0xff,0xff,0xff,0x78,0xff,0xff,0xff,0xf0,0x7,0x77,0x7f,0xff,0xff,0x8,
28+
0xff,0xff,0xff,0xf0,0x7,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
29+
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
30+
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
31+
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
32+
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
33+
0xff,0xff,0xff,0x70,0x8f,0xff,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
34+
0xff,0xff,0xff,0x70,0x8f,0x87,0xff,0xff,0xff,0xf0,0x8f,0xff,0xff,0xff,0xff,0x8,
35+
0xff,0xff,0xff,0xf0,0x8,0x70,0xff,0xff,0xff,0xf7,0x8f,0xff,0xff,0xff,0xff,0x77,
36+
0xff,0xff,0xff,0xff,0x77,0xff,0xff,0x8f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
37+
0xf0,0x7,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
38+
0x80,0x11,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
39+
0x11,0x11,0xff,0xff,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,0xff,0xf8,0xff,0xff,0xff,
40+
0x19,0x99,0xff,0xff,0xff,0xff,0xff,0xff,0xf0,0xff,0xff,0xff,0xff,0x8f,0xff,0xff,
41+
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0x8f,0xff,0xff,0xff,0xf7,0xff,0xff,
42+
0xff,0xff,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0xf,0xff,0xff,0xff,0xf0,0xff,0xff,
43+
0xff,0xff,0x7f,0xff,0xff,0xff,0xff,0xff,0xff,0x78,0xff,0xff,0xff,0xff,0xf,0xff,
44+
0xff,0xff,0xf0,0xff,0xff,0xf,0xff,0xff,0xff,0xf0,0xf,0xff,0xff,0xff,0x70,0x7f,
45+
0xff,0xff,0xff,0x7,0xff,0x0,0xff,0xff,0xff,0xf0,0x0,0xff,0xff,0xff,0xf0,0x7,
46+
0xff,0xff,0xff,0x70,0xff,0x0,0xf,0xff,0xff,0xf8,0x0,0xf,0xff,0xff,0xff,0x0,
47+
0x7f,0xff,0xff,0xf0,0xf,0x0,0x0,0xff,0xff,0xff,0x0,0x0,0xff,0xff,0xff,0x0,
48+
0x8,0xff,0xff,0xf8,0x7,0x70,0x0,0xf,0xff,0xff,0x0,0x0,0x8f,0xff,0xff,0x0,
49+
0x0,0xff,0xff,0xf7,0x8,0xff,0xf0,0x0,0x0,0x70,0x0,0x70,0x0,0x7,0x78,0x0,
50+
0x0,0x0,0x7f,0x70,0x0,0xff,0xff,0x70,0x0,0x0,0x0,0xff,0x80,0x0,0x0,0x0,
51+
0xff,0x0,0x0,0x0,0x8,0xff,0xff,0xff,0x80,0x0,0x7,0xff,0xff,0x0,0x0,0x8,
52+
0xff,0xf0,0x0,0x0,0xf,0xff,0xff,0xff,0xf7,0x0,0x8f,0xff,0xff,0xf0,0x0,0x8f,
53+
0xff,0xf7,0x0,0x0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
54+
0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
55+
0xff,0xff,0xff,0xff,0xff,
56+
57+
};
58+
59+
static const unsigned char qt_resource_name[] = {
60+
// Resources
61+
0x0,0x9,
62+
0xa,0x6c,0x38,0x43,
63+
0x0,0x52,
64+
0x0,0x65,0x0,0x73,0x0,0x6f,0x0,0x75,0x0,0x72,0x0,0x63,0x0,0x65,0x0,0x73,
65+
// plotWindow.bmp
66+
0x0,0xe,
67+
0xd,0xbd,0xec,0x0,
68+
0x0,0x70,
69+
0x0,0x6c,0x0,0x6f,0x0,0x74,0x0,0x57,0x0,0x69,0x0,0x6e,0x0,0x64,0x0,0x6f,0x0,0x77,0x0,0x2e,0x0,0x62,0x0,0x6d,0x0,0x70,
70+
71+
};
72+
73+
static const unsigned char qt_resource_struct[] = {
74+
// :
75+
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,
76+
// :/Resources
77+
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x2,
78+
// :/Resources/plotWindow.bmp
79+
0x0,0x0,0x0,0x18,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
80+
81+
};
82+
83+
QT_BEGIN_NAMESPACE
84+
85+
extern bool qRegisterResourceData
86+
(int, const unsigned char *, const unsigned char *, const unsigned char *);
87+
88+
extern bool qUnregisterResourceData
89+
(int, const unsigned char *, const unsigned char *, const unsigned char *);
90+
91+
QT_END_NAMESPACE
92+
93+
94+
int QT_MANGLE_NAMESPACE(qInitResources)()
95+
{
96+
QT_PREPEND_NAMESPACE(qRegisterResourceData)
97+
(0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
98+
return 1;
99+
}
100+
101+
Q_CONSTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qInitResources))
102+
103+
int QT_MANGLE_NAMESPACE(qCleanupResources)()
104+
{
105+
QT_PREPEND_NAMESPACE(qUnregisterResourceData)
106+
(0x01, qt_resource_struct, qt_resource_name, qt_resource_data);
107+
return 1;
108+
}
109+
110+
Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources))
111+

‎OMNotebook/ext/qtres.qrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<RCC>
2+
<qresource prefix="/" >
3+
<file>Resources/plotWindow.bmp</file>
4+
</qresource>
5+
</RCC>

‎OMNotebook/ext/resource.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by ext.rc
4+
//
5+
#define IDI_ICON1 104
6+
#define IDB_BITMAP1 106
7+
8+
// Next default values for new objects
9+
//
10+
#ifdef APSTUDIO_INVOKED
11+
#ifndef APSTUDIO_READONLY_SYMBOLS
12+
#define _APS_NEXT_RESOURCE_VALUE 107
13+
#define _APS_NEXT_COMMAND_VALUE 40001
14+
#define _APS_NEXT_CONTROL_VALUE 1001
15+
#define _APS_NEXT_SYMED_VALUE 101
16+
#endif
17+
#endif

0 commit comments

Comments
 (0)