Skip to content

Commit

Permalink
*Added some missing files
Browse files Browse the repository at this point in the history 
*Prevented overwriting of files in some cases
*Fixed some filenames

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3501 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Henrik Eriksson committed Apr 29, 2008
1 parent 345890a commit 323228c
Show file tree
Hide file tree
Showing 13 changed files with 507 additions and 32 deletions.
Binary file added OMNotebook/OMNotebookQT4/Resources/toolbarIcons/apply.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OMNotebook/OMNotebookQT4/Resources/toolbarIcons/image.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_right.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_under.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 17 additions & 17 deletions OMNotebook/OMNotebookQT4/generatedfiles/qrc_res_qt.cpp
View file
@@ -1,7 +1,7 @@
/****************************************************************************
** Resource object code
**
** Created: Tue 19. Feb 14:31:37 2008
** Created: Tue 29. Apr 08:20:56 2008
** by: The Resource Compiler for Qt version 4.3.2
**
** WARNING! All changes made in this file will be lost!
Expand All @@ -10,7 +10,7 @@
#include <QtCore/qglobal.h>

static const unsigned char qt_resource_data[] = {
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/omnotebook_png.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/omnotebook_png.png
0x0,0x0,0xc,0xb7,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -217,7 +217,7 @@ static const unsigned char qt_resource_data[] = {
0xba,0xec,0x18,0x40,0xdb,0xe7,0xae,0xdc,0xe,0x0,0xc0,0x9,0x0,0x0,0xff,0xff,
0x3,0x0,0xed,0x2f,0xa0,0x3,0xd7,0xce,0x1b,0x5,0x0,0x0,0x0,0x0,0x49,0x45,
0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/find.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/find.png
0x0,0x0,0x4,0x98,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -294,7 +294,7 @@ static const unsigned char qt_resource_data[] = {
0x31,0xc1,0x39,0x97,0x9a,0xa6,0xc9,0xf6,0xf6,0x76,0xd9,0xd7,0xd7,0x87,0x50,0x28,
0x84,0x7f,0x1,0x2f,0xbc,0x2a,0x99,0x4a,0x1e,0xcb,0x48,0x0,0x0,0x0,0x0,0x49,
0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editcut.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editcut.png
0x0,0x0,0x4,0x33,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -365,7 +365,7 @@ static const unsigned char qt_resource_data[] = {
0xbb,0xf6,0xeb,0xf5,0xeb,0xd7,0xff,0x9e,0x9b,0x9b,0x73,0x0,0xff,0x2,0x78,0x83,
0x1,0xf6,0x81,0x92,0xa3,0xa4,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_under.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_under.png
0x0,0x0,0x2,0x34,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -404,7 +404,7 @@ static const unsigned char qt_resource_data[] = {
0x7,0xfc,0x5a,0xc1,0x6b,0xa1,0x83,0x21,0x77,0xcc,0xd2,0x3e,0xe,0xe0,0x1f,0x8f,
0x9,0x30,0x66,0x8f,0x64,0x4b,0xa5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,
0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/image.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/image.png
0x0,0x0,0x5,0xb9,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -499,7 +499,7 @@ static const unsigned char qt_resource_data[] = {
0x70,0xe2,0xc4,0x89,0x70,0xf9,0xf2,0xe5,0x70,0xe5,0xca,0x95,0x91,0xa8,0x3c,0xed,
0xd7,0xf3,0xff,0x0,0x81,0xf1,0x68,0xed,0x28,0x1f,0xae,0xcc,0x0,0x0,0x0,0x0,
0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/exit.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/exit.png
0x0,0x0,0x5,0x82,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -591,7 +591,7 @@ static const unsigned char qt_resource_data[] = {
0x7e,0x3f,0xb7,0xb5,0xb5,0x71,0x2c,0x16,0x83,0x10,0x2,0x7f,0x0,0x9f,0x34,0x94,
0x50,0x4f,0xf,0x4a,0xb8,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,
0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/filesave.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/filesave.png
0x0,0x0,0x3,0xf3,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -658,7 +658,7 @@ static const unsigned char qt_resource_data[] = {
0xcb,0xcc,0xcb,0x2e,0x4e,0x4e,0x2c,0x48,0xd5,0xcb,0x2f,0x4a,0x7,0x0,0x36,0xd8,
0x6,0x58,0x10,0x53,0xca,0x5c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/fileopen.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/fileopen.png
0x0,0x0,0x4,0xeb,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -740,7 +740,7 @@ static const unsigned char qt_resource_data[] = {
0x0,0x0,0x78,0xda,0x2b,0x2f,0x2f,0xd7,0xcb,0xcc,0xcb,0x2e,0x4e,0x4e,0x2c,0x48,
0xd5,0xcb,0x2f,0x4a,0x7,0x0,0x36,0xd8,0x6,0x58,0x10,0x53,0xca,0x5c,0x0,0x0,
0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/redo.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/redo.png
0x0,0x0,0x4,0x6a,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -814,7 +814,7 @@ static const unsigned char qt_resource_data[] = {
0x29,0x25,0x5b,0x96,0x65,0x5c,0xd7,0xe5,0x6c,0x36,0xcb,0x9d,0x9d,0x9d,0xbc,0x77,
0xef,0x5e,0x0,0xc0,0x9f,0xbe,0xf5,0x8f,0xb2,0x68,0xfe,0x83,0x70,0x0,0x0,0x0,
0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/fileprint.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/fileprint.png
0x0,0x0,0x3,0xd8,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -879,7 +879,7 @@ static const unsigned char qt_resource_data[] = {
0xca,0xb6,0x6d,0x9d,0x4a,0xa5,0xd4,0xc4,0xc4,0x84,0x9e,0x9a,0x9a,0xd2,0x3,0x3,
0x3,0xfa,0x5f,0x7,0x89,0x95,0xbc,0x1,0x18,0x92,0xfc,0x0,0x0,0x0,0x0,0x49,
0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/undo.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/undo.png
0x0,0x0,0x4,0x2b,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -949,7 +949,7 @@ static const unsigned char qt_resource_data[] = {
0x9a,0xa6,0x3a,0x8e,0x13,0x44,0x22,0x11,0x5d,0xbe,0x7c,0xb9,0x76,0x75,0x75,0xe9,
0x81,0x3,0x7,0x0,0xf8,0x13,0x76,0x1d,0x8b,0x6,0x56,0xe2,0x55,0x4a,0x0,0x0,
0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editpaste.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editpaste.png
0x0,0x0,0x3,0xba,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -1012,7 +1012,7 @@ static const unsigned char qt_resource_data[] = {
0x54,0x54,0x55,0x56,0x57,0xdb,0x5b,0xb,0xb,0xb,0xbf,0xb7,0x5a,0xad,0xf9,0xd9,
0xd9,0xd9,0xbf,0xfe,0x6,0x84,0xb4,0xa8,0xcc,0x20,0x59,0x7e,0xbb,0x0,0x0,0x0,
0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/apply.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/apply.png
0x0,0x0,0x4,0x53,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -1085,7 +1085,7 @@ static const unsigned char qt_resource_data[] = {
0xb2,0xdb,0xed,0x54,0x56,0x56,0x46,0xb2,0x2c,0x3,0x63,0xc,0xfe,0x4,0x66,0x34,
0xea,0x8d,0x15,0x7f,0xd4,0xb1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,
0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editcopy.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editcopy.png
0x0,0x0,0x2,0xee,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -1135,7 +1135,7 @@ static const unsigned char qt_resource_data[] = {
0x93,0x58,0x7d,0x1e,0xa6,0x6a,0x6a,0x66,0x3a,0x9f,0xcf,0x1e,0x2f,0x2f,0x2f,0xaf,
0xcf,0xce,0xce,0x2e,0xce,0xcf,0xcf,0xf5,0x2f,0xb8,0xa9,0x70,0x31,0xb9,0xe0,0x9a,
0x3f,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_right.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/text_right.png
0x0,0x0,0x4,0xbf,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down Expand Up @@ -1214,7 +1214,7 @@ static const unsigned char qt_resource_data[] = {
0xe4,0xf3,0xf9,0x10,0x45,0x91,0x4c,0x4e,0x4e,0xca,0xf9,0xf3,0xe7,0xe5,0xf2,0xe5,
0xcb,0x72,0xe3,0xc6,0xd,0xc5,0xff,0xc5,0xfe,0x6,0x8a,0x2b,0x8e,0x17,0xb9,0xd6,
0xef,0x1c,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
// C:/om/061102/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/filenew.png
// C:/om/070621/OMNotebook/OMNotebookQT4/Resources/toolbarIcons/filenew.png
0x0,0x0,0x3,0x35,
0x89,
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
Expand Down
23 changes: 14 additions & 9 deletions OMNotebook/OMNotebookQT4/notebookcommands.h
View file
Expand Up @@ -135,8 +135,9 @@ namespace IAEX


QFile file( filename_ );
if(file.open(QIODevice::WriteOnly))
{

// if(file.open(QIODevice::WriteOnly)) //Don't overwrite old files before the document has been serialized
// {
// 2005-12-05 AF, update links
try
{
Expand Down Expand Up @@ -176,14 +177,18 @@ namespace IAEX
// QTextStream filestream(&file);
// QDataStream filestream(&file);

if(filename_.endsWith("onbz", Qt::CaseInsensitive))
// filestream << qCompress(doc.toByteArray());
file.write(qCompress(doc.toByteArray(), 9));
else
//filestream << doc.toByteArray();
file.write(doc.toByteArray());
if(doc.toByteArray().size() && file.open(QIODevice::WriteOnly))
{

if(filename_.endsWith("onbz", Qt::CaseInsensitive))
// filestream << qCompress(doc.toByteArray());
file.write(qCompress(doc.toByteArray(), 9));
else
//filestream << doc.toByteArray();
file.write(doc.toByteArray());

file.close();
file.close();


// AF, Added this
doc_->setFilename( filename_ );
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/OMNotebookQT4/printervisitor.cpp
View file
Expand Up @@ -75,7 +75,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
#include <QPainter>
#include <QTemporaryFile>
#include <QGraphicsRectItem>
#include "../Pltpkg2/LegendLabel.h"
#include "../Pltpkg2/legendLabel.h"
namespace IAEX
{
/*!
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/OMNotebookQT4/xmlparser.cpp
View file
Expand Up @@ -76,7 +76,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
#include "graphcell.h"
#include <QMessageBox>
#include <QPushButton>
#include "../Pltpkg2/LegendLabel.h"
#include "../Pltpkg2/legendLabel.h"

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/Pltpkg2/curve.cpp
View file
Expand Up @@ -51,7 +51,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
//IAEX headers
#include "curve.h"
#include "point.h"
#include "LegendLabel.h"
#include "legendLabel.h"
#include "line2D.h"


Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/Pltpkg2/graphWidget.cpp
View file
Expand Up @@ -86,7 +86,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
#include "variableData.h"
#include "graphWindow.h"
#include "point.h"
#include "LegendLabel.h"
#include "legendLabel.h"
#include "curve.h"
#include "focusRect.h"
#include "variablewindow.h"
Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/Pltpkg2/graphWindow.cpp
View file
Expand Up @@ -59,7 +59,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
#include "graphWindow.h"
#include "dataSelect.h"
#include "preferenceWindow.h"
#include "LegendLabel.h"
#include "legendLabel.h"
#include "variablewindow.h"
using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion OMNotebook/Pltpkg2/legendLabel.cpp
View file
Expand Up @@ -50,7 +50,7 @@ licence: http://www.trolltech.com/products/qt/licensing.html
#include <QColorDialog>

//IAEX headers
#include "LegendLabel.h"
#include "legendLabel.h"
#include "curve.h"

LegendLabel::LegendLabel(QColor color_, QString& s, QWidget* parent, bool showline, bool showpoints, int maxHeight): QLabel(s, parent), color(color_)
Expand Down

0 comments on commit 323228c

Please sign in to comment.