Commit Graph

259 Commits (ce5b38d96e3d15f8df7ac6a82f45e61e0b63f777)

Author SHA1 Message Date
Tim Deagan ce5b38d96e Add on-launch code to set Document Icon in windows registry
Since OpenSCAD doesn't distribute with additional image files, this means a new icon needs to be built into the .exe. This is accomplished by adding a line to the end of openscad_win32.rc file consisting of something like the following:
IDI_ICON2 ICON DISCARDABLE "icons/openscad_doc.ico"
which will get built into the exe as icon index 1 (icon index 0 is the current app icon.)

In the cmdline and gui functions in openscad.cc I added code to set the HKEY_CURRENT_USER/Software/Classes/OpenSCAD_File/DefaultIcon/Default value to the icon index 1 of openscad.exe

	modified:   openscad_win32.rc
	modified:   src/openscad.cc
2015-01-11 18:21:08 -06:00
Marius Kintel 93a9db4917 Merge branch 'master' into warning-in-viewport 2015-01-07 23:42:15 -05:00
Torsten Paul da657d7543 Treat deprecation as warning message (fixes #1143). 2015-01-07 17:05:50 +01:00
Marius Kintel 2eda0b60a0 cosmetics 2015-01-06 22:50:07 -05:00
Marius Kintel 27f8370c7b Export blank image on empty top-level objects, instead of no image 2015-01-05 21:41:05 -05:00
Torsten Paul fd4fe0816a Fix style sheet to remove borders from QStatusBar items. 2014-12-25 18:22:51 +01:00
Marius Kintel a68560707f Merge branch 'master' of github.com:openscad/openscad 2014-12-23 01:10:23 -05:00
Marius Kintel 328cd7f362 #1028 Adjusted return values for errors 2014-12-23 01:07:35 -05:00
Marius Kintel b48089e694 Merge branch 'master' of git://github.com/jgelderloos/openscad 2014-12-23 01:02:50 -05:00
Marius Kintel 9b00f69311 #1065 Made font cache progress dialog indeterminate also on Windows 2014-12-23 00:49:37 -05:00
Torsten Paul b37b49f407 Add version number to launching screen and main windows (fixes #1101). 2014-12-23 03:56:17 +01:00
Torsten Paul 5ad36c82b6 Add OpenSCAD version to the status bar. 2014-12-23 03:33:42 +01:00
Torsten Paul 98a9ea7e12 Use QtConcurrentRun to initialize FontConfig in a separate thread. 2014-12-21 03:49:20 +01:00
Marius Kintel 1aef9f2758 #1065 Show progress dialog while building font cache 2014-12-17 12:12:53 -05:00
jgelderloos 01ce545e1a Merge branch 'master' of https://github.com/jgelderloos/openscad 2014-12-13 16:21:18 -05:00
jgelderloos 6f68330ce0 Changed exit codes to 0 and added help description to help menu #1028 2014-12-13 16:03:25 -05:00
Torsten Paul 342af594ad Disable vertical refresh syncing. 2014-12-08 18:54:39 +01:00
Torsten Paul b6167b0b60 Merge branch 'master' into translation2
Conflicts:
	src/PlatformUtils.h
2014-12-04 20:51:44 +01:00
Torsten Paul dc8f559b85 Use class hierarchy for the different types of expressions. 2014-11-24 23:37:42 +01:00
Marius Kintel b2c205ba4c Merge remote-tracking branch 'origin/master' into translation2
Conflicts:
	tests/csgtexttest.cc
2014-11-17 21:56:53 -05:00
Marius Kintel 1afb706461 Merge remote-tracking branch 'origin/master' into translation2 2014-11-17 21:55:19 -05:00
Torsten Paul 8cf85e0987 Fix MDI issues. 2014-11-16 19:35:16 +01:00
Torsten Paul e1db572688 Fix application path initialization for --info. 2014-11-15 22:44:46 +01:00
Torsten Paul 7761c0887b Postpone color scheme initialization after the application path is set. 2014-11-15 22:44:46 +01:00
Torsten Paul 99c617562c Remove obsolete LOCALE_PREFIX and update documentation. 2014-11-13 00:39:17 +01:00
Torsten Paul 59c4dec623 Merge branch 'master' into translation2 2014-11-12 23:21:42 +01:00
Marius Kintel 40aae17c0e Move software update menu handling to AutoUpdater. This should fix #714 2014-11-10 15:01:34 -05:00
Marius Kintel 7086f5fc37 Fixed build issue related to https://svn.boost.org/trac/boost/ticket/6455 2014-11-05 18:58:45 +04:00
Torsten Paul 6cd441e0f1 Port translation code to use resource path from PlatformUtils. 2014-10-19 01:43:45 +02:00
Torsten Paul 05c3c3e76c Add gettext to new dialogs. 2014-10-19 01:25:23 +02:00
Torsten Paul 929d909947 Set Qt text encoding to UTF-8. 2014-10-19 01:25:23 +02:00
Torsten Paul 8f2491cd0a Support linux packaging structure with shared locale folder. 2014-10-19 01:25:23 +02:00
Torsten Paul cfe14254d4 Handle resource layout on linux and add translation files to openscad.pro. 2014-10-19 01:25:23 +02:00
Torsten Paul d620c8f40b Allow localization to be enabled/disabled by configuration settings.
This is only the logic to check the settings, no GUI.
Changing the setting requires a restart as disabling localization simply
skips the call to bindtextdomain() at the application start.
2014-10-19 01:25:23 +02:00
Torsten Paul ae2d19241e Use application resource path to locate the translation files. 2014-10-19 01:25:23 +02:00
Torsten Paul a7e3c8639c Fix compile problem on MinGW and force UTF-8 as encoding. 2014-10-19 01:25:23 +02:00
Marius Kintel 3dca2873e0 Handle arriving FileOpen events while the launchscreen is active, cleaned up some code, make static MainWindow handling more robust. Fixes #972 2014-10-09 22:13:18 -04:00
Marius Kintel a4b999e0d4 Use same UI inheritance style for launchingscreen as other components, indentation fixes 2014-10-09 17:21:15 -04:00
Torsten Paul d67b01c7f2 Default to show welcome screen if no settings value available. 2014-09-14 04:00:17 +02:00
Torsten Paul aec33dd75f Separate launching screen from main window and show before main window opens. 2014-09-14 02:08:57 +02:00
Torsten Paul 8c892907c2 Make welcome screen resizable and update some minor UI issues.
- Move images to icons folder
- Move "Show welcome screen" to advanced tab in preferences
- Set button styles via Qt stylesheet to handle hover and disable
- Rename config setting to "launcher/showOnStartup" and add default
2014-09-13 23:52:21 +02:00
Torsten Paul e7d3025753 Merge branch 'master' into launchingscreen
Conflicts:
	openscad.pro
	openscad.pro.user
	src/MainWindow.h
	src/Preferences.cc
	src/Preferences.h
	src/Preferences.ui
	src/mainwin.cc
	src/openscad.cc
2014-09-13 21:19:44 +02:00
Marius Kintel 51c54f2e5b Add --render=cgal option for test purposes (forces conversion to CGAL Nef polyhedron before rendering 2014-09-04 17:35:32 -04:00
Marius Kintel 0f9450137f Refactored resource path lookup 2014-08-27 16:00:15 -04:00
Marius Kintel 724fbbab5f Handle failure to convert cmd-line parameters to numbers. Fixes #908 2014-08-21 16:28:59 -04:00
shaina7837 c7ea10575a minor code cleanup 2014-08-18 10:29:38 +05:30
Marius Kintel e8407afc6d #703 Don't try to export empty objects 2014-08-17 12:38:06 -04:00
Marius Kintel e70bc04197 Colormap functionality from pull request #816, mostly by Don Bright, includes new colormaps by shaina 2014-08-14 17:16:24 -04:00
Marius Kintel 84b11c29d9 #894 compile fix for MDI mode, minor cleanup 2014-08-13 15:30:47 -04:00
shaina7837 9925639a45 no launching screen if filename is given at cmd line 2014-08-03 21:36:38 +05:30