diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
| commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
| tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /src/MainWindow.ui | |
| parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
| parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.cc
Diffstat (limited to 'src/MainWindow.ui')
| -rw-r--r-- | src/MainWindow.ui | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/MainWindow.ui b/src/MainWindow.ui index 9dfc5dc..8e995cd 100644 --- a/src/MainWindow.ui +++ b/src/MainWindow.ui @@ -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,6 +680,14 @@ <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> |