Skip to content

Commit

Permalink
*Added a toolbar in OMNotebook
Browse files Browse the repository at this point in the history 
*Added an external graphics window
*Misc. improvements to the plotting functionality

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@3187 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Henrik Eriksson committed Feb 14, 2008
1 parent 779b57a commit 96322a6
Show file tree
Hide file tree
Showing 55 changed files with 3,695 additions and 454 deletions.
3 changes: 2 additions & 1 deletion OMNotebook/NotebookParser/NotebookParser.vcproj
View file
Expand Up @@ -67,7 +67,8 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
DebugInformationFormat="3"
DisableSpecificWarnings="4311; 4312"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Expand Down
259 changes: 140 additions & 119 deletions OMNotebook/OMNotebookQT4/ImageSizeDlg.ui
View file
@@ -1,133 +1,138 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>ImageDialog</class>
<widget class="QDialog" name="ImageDialog" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>317</width>
<height>41</height>
<width>338</width>
<height>126</height>
</rect>
</property>
<property name="windowTitle" >
<string>Set Image Size</string>
</property>
<widget class="QWidget" name="layoutWidget" >
<property name="geometry" >
<rect>
<x>20</x>
<y>250</y>
<width>351</width>
<height>33</height>
</rect>
</property>
</widget>
<widget class="QWidget" name="verticalLayout_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>241</width>
<height>41</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Select image size</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Width:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="widthEdit" />
</item>
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Height:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="heightEdit" />
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="verticalLayout" >
<property name="geometry" >
<rect>
<x>240</x>
<y>10</y>
<width>77</width>
<height>31</height>
</rect>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>OK</string>
</property>
</widget>
</item>
</layout>
</widget>
<layout class="QVBoxLayout" >
<item>
<layout class="QVBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Select image size</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="spacing" >
<number>6</number>
</property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Width:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="widthEdit" />
</item>
<item>
<widget class="QLabel" name="label_3" >
<property name="text" >
<string>Height:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="heightEdit" />
</item>
</layout>
</item>
</layout>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" >
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>141</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton" >
<property name="text" >
<string>Ok</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton" >
<property name="text" >
<string>Cancel</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<resources/>
<connections>
<connection>
Expand All @@ -137,14 +142,30 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel" >
<x>291</x>
<y>19</y>
<x>221</x>
<y>69</y>
</hint>
<hint type="destinationlabel" >
<x>304</x>
<y>6</y>
</hint>
</hints>
</connection>
<connection>
<sender>cancelButton</sender>
<signal>clicked()</signal>
<receiver>ImageDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel" >
<x>294</x>
<y>78</y>
</hint>
<hint type="destinationlabel" >
<x>160</x>
<y>114</y>
</hint>
</hints>
</connection>
</connections>
</ui>
Binary file added OMNotebook/OMNotebookQT4/Resources/toolbarIcons/editcopy.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/editcut.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/editpaste.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/exit.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/filenew.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/fileopen.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/fileprint.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/filesave.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/find.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/redo.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/undo.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions OMNotebook/OMNotebookQT4/cellcursor.cpp
View file
@@ -1,3 +1,4 @@
#define QT_NO_DEBUG_OUTPUT
/*
------------------------------------------------------------------------------------
This file is part of OpenModelica.
Expand Down

0 comments on commit 96322a6

Please sign in to comment.