diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /src/MainWindow.ui | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'src/MainWindow.ui')
| -rw-r--r-- | src/MainWindow.ui | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/MainWindow.ui b/src/MainWindow.ui index f71ac96..8e995cd 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -38,7 +38,7 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <widget class="GLView" name="glview" native="true"/> + <widget class="QGLView" name="qglview" native="true"/> <widget class="QTextEdit" name="console"> <property name="readOnly"> <bool>true</bool> @@ -223,6 +223,7 @@ <addaction name="helpActionHomepage"/> <addaction name="helpActionManual"/> <addaction name="helpActionLibraryInfo"/> + <addaction name="appActionUpdateCheck"/> </widget> <addaction name="menu_File"/> <addaction name="menu_Edit"/> @@ -611,6 +612,9 @@ </property> </action> <action name="helpActionAbout"> + <property name="enabled"> + <bool>true</bool> + </property> <property name="text"> <string>About</string> </property> @@ -676,12 +680,20 @@ <string>Library info</string> </property> </action> + <action name="appActionUpdateCheck"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Check for Update..</string> + </property> + </action> </widget> <customwidgets> <customwidget> - <class>GLView</class> + <class>QGLView</class> <extends>QWidget</extends> - <header>GLView.h</header> + <header>QGLView.h</header> <container>1</container> </customwidget> <customwidget> |